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..72db6ce87d69f00ce62d2f3f277a54f6fdd0f693 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 217626723957161191572ea50172a3943c30696d
+Subproject commit 72db6ce87d69f00ce62d2f3f277a54f6fdd0f693
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/css/files.css b/apps/files/css/files.css
index f2ca1065ecad4fc977a0135dfefb0bf85fcfb699..117aac4c93e8ed977d42d467f085b0361ee67b2c 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;
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/filelist.js b/apps/files/js/filelist.js
index c847e2eff8bd3b1b98977bb1377c4865406477fa..b858e2580ee16b9e340f47abceda963ecec68477 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);
@@ -393,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");
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 51b3f31fb961f65d8f721311810bff937ac884d8..3fad3fae7d39ed34b063541c43da59a92fea96ee 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,9 +756,7 @@ 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){
@@ -847,3 +845,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");
+		}
+	});
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 51d450b4f68ef5faa9a2dcb14b8bbd2a73e9b08c..8d5f69f33184da19368df9b830fa157c77882ce5 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "No teniu permisos d'escriptura aquí.",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
 "Download" => "Baixa",
-"Size (MB)" => "Mida (MB)",
 "Unshare" => "Deixa de compartir",
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index c2f200e476fe956b2b9247b966b2a982840d4a6a..3dd82fadba5252f6bffcf06e71f6c304a03b2a10 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,6 +1,8 @@
 <?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",
@@ -47,6 +49,7 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"%s could not be renamed" => "%s kunne ikke omdøbes",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
@@ -70,6 +73,8 @@
 "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..."
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 435c821400df2cf15c0310d9b78f45ecb404be31..33430795ddde4423f3365299b12c670a846cd67d 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Du hast hier keine Schreib-Berechtigung.",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
 "Download" => "Herunterladen",
-"Size (MB)" => "Größe (MB)",
 "Unshare" => "Freigabe aufheben",
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 3a323321ba81ac02deeb998c27350e12da96a435..3ce3b2a7fb5ae536a9fa57d9efd80f6d143bb64c 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,5 +1,5 @@
 <?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 - 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",
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.",
 "Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
 "Download" => "Herunterladen",
-"Size (MB)" => "Größe (MB)",
 "Unshare" => "Freigabe aufheben",
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 2d5ac06ff97a6197fada66c0f8b25e7ceb24cf6e..78740d5150726cad47c6d324c35e1b07aa75546c 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "No tiene permisos de escritura aquí.",
 "Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
 "Download" => "Descargar",
-"Size (MB)" => "Tamaño (MB)",
 "Unshare" => "Dejar de compartir",
 "Upload too large" => "Subida demasido grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 10bde4c3856d1fb8b0be46e0abae1d5794c3665c..3fc3be179822ee5467b78b25f6c85d01df813b9d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -9,20 +9,20 @@
 "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",
@@ -30,9 +30,9 @@
 "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",
+"perform delete operation" => "Llevar a cabo borrado",
 "1 file uploading" => "Subiendo 1 archivo",
 "files uploading" => "Subiendo archivos",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
@@ -40,7 +40,7 @@
 "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",
@@ -49,12 +49,12 @@
 "{count} folders" => "{count} directorios",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
-"%s could not be renamed" => "%s no se pudo renombrar",
+"%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",
@@ -63,12 +63,11 @@
 "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!",
 "Download" => "Descargar",
-"Size (MB)" => "Tamaño (MB)",
 "Unshare" => "Dejar de compartir",
 "Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 8ba928be94d6cab7d83a61d9e3509c97978a400d..c58b066e28719c9fe934f15cd83834971e251fae 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Siin puudvad sul kirjutamisõigused.",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
 "Download" => "Lae alla",
-"Size (MB)" => "Suurus (MB)",
 "Unshare" => "Lõpeta jagamine",
 "Upload too large" => "Ãœleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index c87e20b1ff66e4e322f97aeb1ac6e11d633f632e..96bfb2d1cc8e831cb6ba30afc6f8b13193bc299c 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,6 +1,8 @@
 <?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 +19,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",
@@ -46,6 +49,7 @@
 "{count} folders" => "{count} karpeta",
 "1 file" => "fitxategi bat",
 "{count} files" => "{count} fitxategi",
+"%s could not be renamed" => "%s ezin da berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
@@ -69,6 +73,8 @@
 "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..."
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 8a6089f635beadb8d68d54e7f1ba14f2626839b9..73f4b493b4d88b3d02edf3fe8819169444a2d6ba 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "شما اجازه ی نوشتن در اینجا را ندارید",
 "Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
 "Download" => "دانلود",
-"Size (MB)" => "اندازه(مگابایت)",
 "Unshare" => "لغو اشتراک",
 "Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index c57c0ea898ee2804089cd532948c10889e150ce7..40df7b1546eef85139440f495017386d24532fd1 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -60,7 +60,6 @@
 "You don’t have write permissions here." => "Tunnuksellasi ei ole kirjoitusoikeuksia tänne.",
 "Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
 "Download" => "Lataa",
-"Size (MB)" => "Koko (Mt)",
 "Unshare" => "Peru jakaminen",
 "Upload too large" => "Lähetettävä tiedosto on liian suuri",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index dc1a33ac65cf61645b73597ff62d1bf816ee9eb4..b293f85ed4239665caa1dfa84ccc7afea5fbc296 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Vous n'avez pas le droit d'écriture ici.",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
 "Download" => "Télécharger",
-"Size (MB)" => "Taille (Mo)",
 "Unshare" => "Ne plus partager",
 "Upload too large" => "Téléversement trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 4a1c7720caf7637511af2b4c16c382478dc5da5b..bba6335ae053d9c617b1fdd21020422b54a09164 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Non ten permisos para escribir aquí.",
 "Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
 "Download" => "Descargar",
-"Size (MB)" => "Tamaño (MB)",
 "Unshare" => "Deixar de compartir",
 "Upload too large" => "Envío demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 8ea6bb48aba49d1f75cebac77af1ae1e7f49d6d9..28b33795aeba64200dcb4b34c7b4e28840d222d5 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Qui non hai i permessi di scrittura.",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
 "Download" => "Scarica",
-"Size (MB)" => "Dimensione (MB)",
 "Unshare" => "Rimuovi condivisione",
 "Upload too large" => "Caricamento troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index cb5480199e28535e8a2824df58b96f9e1f245b15..e4be3133fb0bcd72d53e33477a58d617bd84d4af 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "あなたには書き込み権限がありません。",
 "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
 "Download" => "ダウンロード",
-"Size (MB)" => "サイズ(MB)",
 "Unshare" => "共有解除",
 "Upload too large" => "アップロードには大きすぎます。",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index e6d0ed4104978eff57f8ea664cc0853109f2c448..d4080a179604155ad65855885db02b4c3ff62fa6 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -66,7 +66,6 @@
 "You don’t have write permissions here." => "Du har ikke skrivetilgang her.",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
 "Download" => "Last ned",
-"Size (MB)" => "Størrelse (MB)",
 "Unshare" => "Avslutt deling",
 "Upload too large" => "Filen er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 914d5087af10a3253f02487b1b08de453dd6fd87..0d906cb138b55ed4f43bdaffcd38344608b7c9b6 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -49,6 +49,7 @@
 "{count} folders" => "{count} mappen",
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
+"%s could not be renamed" => "%s kon niet worden hernoemd",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
@@ -72,6 +73,8 @@
 "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..."
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index a1e06483b688164b9311400afcdc5f834de5f05a..3ad679f87646cc426cccfbf00ffad669ee138f12 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Você não possui permissão de escrita aqui.",
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
 "Download" => "Baixar",
-"Size (MB)" => "Tamanho (MB)",
 "Unshare" => "Descompartilhar",
 "Upload too large" => "Upload muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 8656edfc16b5dd32124d5e6ecd82195b66bc78b3..8aeb30efbf21757c4a4c6842496a46448cb7af7a 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "Não tem permissões de escrita aqui.",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
-"Size (MB)" => "Tamanho (MB)",
 "Unshare" => "Deixar de partilhar",
 "Upload too large" => "Upload muito grande",
 "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.",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 225de32d62ea38c56cd404daea5824d1a9af51a4..71742cb4d577354fe883d9fb35527cceebc8e120 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "У вас нет разрешений на запись здесь.",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Download" => "Скачать",
-"Size (MB)" => "Размер (Мб)",
 "Unshare" => "Закрыть общий доступ",
 "Upload too large" => "Файл слишком велик",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 0b2dbb12dd9fc496b422dde6515f50dd7f08b9a7..6b479b580ebb9950a9e51a6518f1431f66ca5a04 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,6 +1,8 @@
 <?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ı.",
@@ -47,6 +49,7 @@
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
 "{count} files" => "{count} dosya",
+"%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,6 +73,8 @@
 "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"
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index a515b8ac1bf55dd0b5c819789aff3bb51360d04a..469211ca7f457828b828637177eb9c35c53a05a8 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "您没有写入权限。",
 "Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
 "Download" => "下载",
-"Size (MB)" => "大小 (MB)",
 "Unshare" => "取消分享",
 "Upload too large" => "上传过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 6801b311ae4d9aeba5678eb1a7bfd40e44d9aaa6..63d2bd923654cd33a8a538ce9bf3f88cb6fbdb06 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -68,7 +68,6 @@
 "You don’t have write permissions here." => "您在這裡沒有編輯權。",
 "Nothing in here. Upload something!" => "這裡什麼也沒有,上傳一些東西吧!",
 "Download" => "下載",
-"Size (MB)" => "大小 (MB)",
 "Unshare" => "取消共享",
 "Upload too large" => "上傳過大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 7d679bc4bf65434cc14be3369d9df7c7230d1c9d..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 (MB)')); ?></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/l10n/da.php b/apps/files_encryption/l10n/da.php
index 1cd43390aa3c289413c65f9e2390be265c0338dc..af0d0b5e94a783b03a7c626aea2393c25ea7be7f 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Saving..." => "Gemmer...",
-"Encryption" => "Kryptering"
+"personal settings" => "Personlige indstillinger",
+"Encryption" => "Kryptering",
+"Enabled" => "Aktiveret",
+"Disabled" => "Deaktiveret",
+"Change Password" => "Skift Kodeord"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 2d7512354d582403395d2e0be10b13dd9cda6f73..79bde7e262650f60f7380195b32e4c3a90eefcfc 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -29,7 +29,7 @@
 "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."
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index 63c7fb7aa4f9d7ebb5a8a13e70455bbe070c9b34..f53bbd437c42e756890f25433f18d113ce1ae4d1 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -6,16 +6,16 @@
 "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.",
-"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 tus opciones personales, para recuperar el acceso a sus archivos.",
+"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.",
-"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, asegurate 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 encriptación fue deshabilitada.",
+"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, asegurate 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 encriptación está deshabilitada.",
 "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",
@@ -23,14 +23,14 @@
 "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"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 22fe7932688894b779294b14687088f4a3c14a75..307cd385e7e924d612cf85e389b32ebf86cd145b 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -7,9 +7,15 @@
 "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.",
+"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." => "Ziurtatu PHP 5.3.3 edo berriagoa instalatuta dagoela eta PHPren OpenSSL gehigarria gaituta eta ongi konfiguratuta dagoela. Oraingoz enkriptazio programa ez dago gaituta.",
 "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,14 @@
 "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"
 );
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index cf8149da3abf724b6c02b9f0b878bd1c1195aabc..52e0997ef7bd08dbab580dddbcb5bfca023dd261 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,18 @@
 <?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" => "파일 복구를 업데이트 할수 없습니다"
 );
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 093ed2c29c8d29ad5ba1dfb778e3587f372bc477..9cf7bcd172156b5a9b5fe3ba774f562f19d79eb9 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -7,6 +7,9 @@
 "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 the OpenSSL 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.",
 "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",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index f485f373a5346850da99dd461c5419859549cdb2..d3cf596fda501d66e9a077db8e53c1182bd69bee 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -5,11 +5,15 @@
 "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.",
+"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.",
+"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 PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está ativada e corretamente configurada. Por agora, a encripitação está desativado.",
 "Saving..." => "A guardar...",
+"personal settings" => "configurações personalizadas ",
 "Encryption" => "Encriptação",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
 "Change Password" => "Mudar a Password",
+"Enable password recovery:" => "ativar recuperação do 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"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 3659e22bb4ea133940492a327947885338908573..2cef6686fce37b83eb4586680489cea68fa4a245 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -8,6 +8,8 @@
 "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 the OpenSSL 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 rätt inställd. Kryperingsappen är därför tillsvidare inaktiverad.",
 "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",
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index d34f51c4870bb6ad4f4217c49b8c68e70bbe63fe..cc43ec37a432204aa8ef32eaa4a8bfa0f4129d9b 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,11 +1,16 @@
 <?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 系統之外被改變(例:您的目錄)。 您可以在個人設定中更新私鑰密碼取回已加密的檔案。",
+"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 且正確設定。目前 encryption app 不可使用。",
 "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" => "無法更新檔案還原設定"
 );
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..ebf678da78ed2f7f536da7db852c47b34e8a3972 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);
 
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/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 7bcefd4176c94ac9da2e6a690c34a4a7b09cd98e..f2dd6108b1a27286d3896f52048f2c5ff9949567 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,301 @@
 
 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;
+	private $connection;
 	private $bucket;
-	private $objects = array();
-	private $id;
+	private static $tmpFiles = array();
+	private $test = false;
+	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) {
+				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) {
+			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) {
+			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) {
+			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) {
+			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) {
+			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) {
+			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) {
+			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) {
+					return false;
 				}
-				break;
+
+				return fopen($tmpFile, 'r');
 			case 'w':
 			case 'wb':
 			case 'a':
@@ -203,45 +342,143 @@ 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) {
+				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) {
+			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) {
+				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) {
+				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 +489,32 @@ 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) {
+			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..4869322d87a9f9fcd78f21b24690ec7a46d3508e 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -234,7 +234,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/l10n/da.php b/apps/files_sharing/l10n/da.php
index e3e469a4e51bce6edd12fc221806345b09873091..cf82e93d4adfa576a591149bb2192d48d4204cc1 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.",
 "Password" => "Kodeord",
 "Submit" => "Send",
 "%s shared the folder %s with you" => "%s delte mappen %s med dig",
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 7a4559cb6556582498caa6127dda0e24fa5b6fb2..1d8891792fb9e28249fc72163dd85dda8550d943 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,4 +1,5 @@
 <?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",
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 03931bf29868ed13bd8f95c2998fce8c4e609bca..370cbd987445eb8f44be7e73622b8e2c28a455a6 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.",
 "Password" => "Salasana",
 "Submit" => "Lähetä",
 "%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi",
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 6c1bf7a53f3682888d3bc4028d9050a3ba4b6c5a..90f2f2290ff64996caba2631d09e65e225903d85 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.",
 "Password" => "Wachtwoord",
 "Submit" => "Verzenden",
 "%s shared the folder %s with you" => "%s deelt de map %s met u",
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 2f41abca1f5fcc648097a27946ab18b70cd24c7d..8b02e73606223b3f819716f9355f1e181f5b75ef 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Password errada, por favor tente de novo",
 "Password" => "Password",
 "Submit" => "Submeter",
 "%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 21e4e542d8e4066690321c83949f84b94d3f148c..dac5e33ec509d32d591401601ccf80c839b771b0 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"The password is wrong. Try again." => "Lösenordet är fel. Försök igen.",
 "Password" => "Lösenord",
 "Submit" => "Skicka",
 "%s shared the folder %s with you" => "%s delade mappen %s med dig",
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 9462844a82b7be7db8a54876744fc6fd57059f2c..3f8e29345a7f2e0118986a6afe4a66f2ed90537c 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));
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/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/js/trash.js b/apps/files_trashbin/js/trash.js
index 87dfea491e76afd917c9ba0bcad616be57612b9f..409e3e59d5a3be3804547ff0f1f36462c978de7d 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/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..ba940084a87cd14cd037e76b927cbe74ae903b17 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')) {
@@ -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_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..278b793a86d686db3775e5205e5e77d7d2a78389 100644
--- a/apps/files_versions/l10n/ar.php
+++ b/apps/files_versions/l10n/ar.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Versions" => "الإصدارات"
+"Versions" => "الإصدارات",
+"Restore" => "استعيد"
 );
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index a03d9adcf079e30dbe53c46d398b9d98034153a2..25254cfb4d8e2b53abf78cff9186f25ad3642b6c 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"success" => "успешно",
-"File %s was reverted to version %s" => "Файлът %s бе върнат към версия %s",
-"Versions" => "Версии"
+"Versions" => "Версии",
+"Restore" => "Възтановяване"
 );
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index 433d974c8cb041d24d11c6caf0324f407cd4afb9..4f92c3412009fc71611b83329a16323a88e5cc0b 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -1,11 +1,5 @@
 <?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"
+"Restore" => "Recupera"
 );
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index 087d800137e7a1f5bf10c089ac5db8122a436e85..a10b8d25b685250fcade8d67e74cec37bedb6a36 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -1,11 +1,5 @@
 <?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"
+"Restore" => "Obnovit"
 );
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
index 447a3d2b85df8f4e0367eef94eada8119f1b6e8c..4a94a749f2e4206ec7464171775d70a34c9b9db9 100644
--- a/apps/files_versions/l10n/da.php
+++ b/apps/files_versions/l10n/da.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index c34a8c1fd3ed3e67291c3d79f44a7b31b2cc0672..e89c216fe43861c6913f464e51cda4d7c4f2d9fe 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index 8354852a5b5e5c6a1da96fabe8737e7faebe9075..e89c216fe43861c6913f464e51cda4d7c4f2d9fe 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index 8b67e471a9ead7048954c81d13ef74d32a2d36e6..d589770553cee7452a341ebcf821ca831a844622 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -1,11 +1,5 @@
 <?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" => "Επαναφορά"
 );
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 17f97808578d71da24b6f2827c1bd714510743f1..72d8625be9e44c20bace7c776c79612e4ef188f3 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index 8c1a30f822aeba4dbba2b3217cdce06a10d2bdb2..b2857bded1758eb6a43d290d56f639c899fc31b8 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,11 +1,5 @@
 <?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"
+"Restore" => "Recuperar"
 );
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index 363693c913b86701f400256af6bef2289c1c7d77..ec55fa8ebf554c03f2e7dbfdded3330ac3c91037 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index c8d2f7cfacdc289bce2ef79d46c63841de943149..271d424df43f8f2f3d29df0efa7c7b4d5488c8a2 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,11 +1,5 @@
 <?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\""
+"Restore" => "Taasta"
 );
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index 2a7f279af16ebe97f40838ec90b346496d915a4a..918b20fb0fd9c35c4e2faacd012f843e447cc4d9 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index 98af636f59081291544e32657fe007d067f35d50..9f77e52662494edcac6ebab862b9449c63487e47 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -1,11 +1,5 @@
 <?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" => "بازیابی"
 );
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 6f138e0f163650e0482945f793c91ae6594c2606..9f6f38ce05d117b311ba2b4ea8ea61b75e0f4dee 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index e2698c5c4aaeeeeb123bd02a15b1d8c23315b613..74931bd70463ce14daeff3b9db59c67985b31c9a 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
index 586ef8c3a68efafd303c8dc4daa7db15b676e139..66e3ccc5dc7df6b4341cddb75e5f26fc34bd310c 100644
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index 577389eb0817ddbf0a3df890e91126142f68dc12..bcac74be08b0675f229074d591597f87a01428dc 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,11 +1,5 @@
 <?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" => "שחזור"
 );
diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php
index 9f7420157e1a683619a8eee153e88e5bb49bd19f..fe3db5211f8ab33f08c676a4ac69f7f0cfc07631 100644
--- a/apps/files_versions/l10n/hu_HU.php
+++ b/apps/files_versions/l10n/hu_HU.php
@@ -1,11 +1,5 @@
 <?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"
+"Restore" => "Visszaállítás"
 );
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
index 48ae5ad622325d10d972ccdcaece69ed37b9d785..96d96130d18cb02e12aabbdc7082fef002b41885 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index bca00879993cd8b8d25ba51fb5ffe5df59e367af..b59d2edfec9c03edc98b2877bf1d876b13b75e64 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -1,11 +1,8 @@
 <?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",
+"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"
 );
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index 0c2dbd401c4eb1950686a7c5844ff1e6db2102d0..d8a99c4980d09ab0678fe19464ad2f73c3ec1ae9 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -1,11 +1,5 @@
 <?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" => "復元"
 );
diff --git a/apps/files_versions/l10n/ka_GE.php b/apps/files_versions/l10n/ka_GE.php
index 6856d647dae57d226a2012ec2c5167ae80816bec..10fe7e705f3da4522d450c33c56d7764482822b6 100644
--- a/apps/files_versions/l10n/ka_GE.php
+++ b/apps/files_versions/l10n/ka_GE.php
@@ -1,11 +1,5 @@
 <?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" => "აღდგენა"
 );
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index df34e4681b421549ec75181338cbcacd2e69bbe1..59856397f5ae6b4eb94cbc9159eaa47219ca7bdc 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,11 +1,5 @@
 <?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" => "복원"
 );
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index fb4574c106a4557f10ea95cbd1657de6ac359efb..84963febb539280818888b655e27dbef2b506f9b 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/lv.php b/apps/files_versions/l10n/lv.php
index bf8d40fa0f0b6fca378602ff349d4b40501bccef..90d54e35de1bcbd9032b23fb7e5a4a8dd879202a 100644
--- a/apps/files_versions/l10n/lv.php
+++ b/apps/files_versions/l10n/lv.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index df59dfe4c8c094872bd470a2d08de9c326dc9430..18ff750f861011931d9883a0ef781f9512ec956a 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Versions" => "Versjoner"
+"Versions" => "Versjoner",
+"Restore" => "Gjenopprett"
 );
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index 9208852212180edef43fa67dedaf884a4dbacf31..77f3e1836cfd67a34087e72d92d0385f62afab95 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
index 940cc2371a107918df31404f5cd3d4504eaa9e71..ce6db36a55ef8800bc322a551b05d0817cfc9169 100644
--- a/apps/files_versions/l10n/nn_NO.php
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index 68944e86760cec54b3c80094ea8e4acd5c409d39..3f4f61ec9e8a4ec5a463f8a049dcc0083ea75a73 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -1,11 +1,5 @@
 <?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"
+"Restore" => "Przywróć"
 );
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
index f13b7931d4b7cfe0f38775578f4ce71e02e925a9..711a38b3bf471a74724a77d0e21bafa6b1cd467b 100644
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
index 93379547295fc4d6fc9c64167d5ccf5e2790e50e..bdb4516d6f19db9af2bb0daa3fea7f9d57dc0fee 100644
--- a/apps/files_versions/l10n/pt_PT.php
+++ b/apps/files_versions/l10n/pt_PT.php
@@ -1,11 +1,5 @@
 <?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."
+"Restore" => "Restaurar"
 );
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index cd9fc89dcc6bb545bdbec800d9713c25ef65f5d5..240cd181aede299def62ba01231ad55a14db2a76 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,11 +1,4 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index 7377fbb5382e1ace08f0a9e2c5fca494e84e7f9d..c94aef09c62814c1449b1473912c016fe13f8527 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,11 +1,5 @@
 <?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" => "Восстановить"
 );
diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
index 50e4af4d96490bbedccaa27af135cd2ddac3acaf..e22a5bb33f6cbad98e44a795308199f02d843cda 100644
--- a/apps/files_versions/l10n/sk_SK.php
+++ b/apps/files_versions/l10n/sk_SK.php
@@ -1,11 +1,5 @@
 <?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ť"
+"Restore" => "Obnoviť"
 );
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index 2df00fc8264e2f74f59fbdce3cd494b754312269..4b1c10c773bb13bebb3938cf66787f575a92e932 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/sr.php b/apps/files_versions/l10n/sr.php
index 0195f84567fe36d7eecba06cd6f5c752a7d7abd5..111fa7768842ecc6df58105a8e90b3b2576d912e 100644
--- a/apps/files_versions/l10n/sr.php
+++ b/apps/files_versions/l10n/sr.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "Историја",
-"Files Versioning" => "Прављење верзија датотека",
-"Enable" => "Омогући"
+"Restore" => "Врати"
 );
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index 83170976309cf99cd964a8dcabcb04a7a2ae9b6a..86d215e501693f86d078314b0463c18ebb269b6d 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -1,11 +1,8 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index 2998f74838991e12191754b17f30c93c4bac2d4d..d42608287a6f5b988973c971c0fe3b9a4b9aba89 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Versions" => "รุ่น"
+"Versions" => "รุ่น",
+"Restore" => "คืนค่า"
 );
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
index 40d276da807fde815eb3256246cae082164eb71b..23da6b6b43d95b1f49b388cb5566812c69234607 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/ug.php b/apps/files_versions/l10n/ug.php
index 024f326b032a9574b864cdda14d9a70df2298aaf..3b63272d927baef8e55bfb4f1dfca2f2c78ada88 100644
--- a/apps/files_versions/l10n/ug.php
+++ b/apps/files_versions/l10n/ug.php
@@ -1,9 +1,4 @@
 <?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" => "نەشرى"
 );
diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php
index e722d95497b290ba8568c3379669d1d7db6e1980..afe44ff3be09d182e00af85f3e54ad586715698f 100644
--- a/apps/files_versions/l10n/uk.php
+++ b/apps/files_versions/l10n/uk.php
@@ -1,11 +1,5 @@
 <?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" => "Відновити"
 );
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 33b045f2e3e859a6e99d3a73ed29bcef23d3e8d9..f3677c8a7754455c4609f0988d103ce768764082 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -1,11 +1,5 @@
 <?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"
 );
diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
index a5285180e6c857eac565b8ba6740bdad3f12e098..e5f4733da8d8d335bf29f9c9bc6029e5455b2cbb 100644
--- a/apps/files_versions/l10n/zh_CN.GB2312.php
+++ b/apps/files_versions/l10n/zh_CN.GB2312.php
@@ -1,11 +1,4 @@
 <?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" => "版本"
 );
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 65d0d284a076f4fe67bcaf7bf2f0902f6c07d66a..8dd2559414eef6cc55481c83ba26eff383cad80e 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -1,11 +1,5 @@
 <?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" => "恢复"
 );
diff --git a/apps/files_versions/l10n/zh_HK.php b/apps/files_versions/l10n/zh_HK.php
index 71bd3bbbd944449b811455a941564b3365253b2f..072d5fbdba89d46e22e48a3e6c2f0a236d72488f 100644
--- a/apps/files_versions/l10n/zh_HK.php
+++ b/apps/files_versions/l10n/zh_HK.php
@@ -1,6 +1,3 @@
 <?php $TRANSLATIONS = array(
-"success" => "成功",
-"failure" => "失敗",
-"No old versions available" => "沒有以往版本",
 "Versions" => "版本"
 );
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index 2ae9ce657ceec2d379c69eaab4ef5933900367c6..7498c6951cd9e8f4585dbd69551433ee20685989 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -1,11 +1,5 @@
 <?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" => "復原"
 );
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index c083a000c37b21f68b7747ce1bd44bbf17bcd5a4..7c75d70f79c15a8030517aae18d05950c4689984 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -239,10 +239,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';
@@ -268,6 +267,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);
 
@@ -276,6 +276,7 @@ class Storage {
 
 			}
 
+			// newest versions first
 			$versions = array_reverse( $versions );
 
 			foreach( $versions as $key => $value ) {
@@ -286,13 +287,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 {
@@ -302,6 +296,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
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/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 4cee35777df353a724ad0ed574a27d7ede63f7ff..6ae99d69a1cdb13ab819e2b0435603a2d12979e3 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -21,14 +21,11 @@
 "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" => "বাইটে",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 7f0849b2382e3b5c9616c7e219652ea3a8d6bd3a..af5efbcb5402095d30b3b39a0aec86d5e4609eb9 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -15,7 +15,6 @@
 "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> 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 +44,20 @@
 "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.",
 "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.",
 "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.",
 "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.",
 "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,13 +70,10 @@
 "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).",
 "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).",
 "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.",
 "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ó",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 65c7c76b5d7811438a8b3b4292c8896def208941..b9fc0d7190189aae897539cbfb60d047e6fe722f 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -15,7 +15,6 @@
 "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> 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 +44,20 @@
 "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",
 "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",
 "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",
 "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",
 "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",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index bf25806d38c3c5eb99f8d40a724a127d5c83a443..09b17e01e2e2804653fa2341418cee744dd343f3 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -15,7 +15,7 @@
 "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",
@@ -45,24 +45,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",
@@ -75,13 +75,13 @@
 "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 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 aus der UUID erstellt. Dies stellt sicher, daß der Name einmalig ist und keine Zeichen umgewandelt werden müssen. Für den internen Benutzernamen sind nur die folgenden Zeichen zulässig: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden durch ihr ASCII-Äquivalent ersetzt oder ausgelassen. Bei Kollisionen wird eine Nummer hinzugefügt/erhöht. Der interne Benutzername wird verwendet, um einen Benutzer intern zu identifizieren. Er ist auch der Standardname für das Benutzerverzeichnis in ownCloud und Teil von Remote-URLs, unter anderem für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten geändert werden. Um ein ähnliches Verhalten wie in ownCloud 5 zu erreichen, geben Sie das Benutzer-Anzeige-Namen-Attribut in das folgende Feld ein. Änderungen betreffen nur neu angelegte LDAP-Benutzer.",
+"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, 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 das UUID-Attribut automatisch. Das UUID-Attribut wird benutzt, um LDAP-Benutzer und Gruppen eindeutig zu identifizieren. Außerdem wird der interne Benutzername basierend auf der UUID erstellt, wenn nicht anders angegeben. Sie können dieses Verhalten ändern und ein Attribut Ihrer Wahl angeben. Sie müssen sichergehen, dass das Attribut Ihrer Wahl auf Benutzer und Gruppen anwendbar und einzigartig ist. Für das Standardverhalten lassen Sie das Feld leer. Änderungen betreffen nur neu angelegte LDAP-Benutzer und Gruppen.",
+"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",
-"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 nutzt die Benutzernamen, 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 vom OwnCloud-Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch OwnCloud gefunden. Der interne OwnCloud-Name, wird in der gesamten OwnCloud verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste in der OwnCloud. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Lösche niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+"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",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index a876119f364ec8798c957c2f520d979dec3b773c..3240f1653cd2ec73778984bbdeeb30abc8685c3c 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -15,7 +15,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 +45,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,13 +75,13 @@
 "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",
-"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 nutzt die Benutzernamen, 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 vom OwnCloud-Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch OwnCloud gefunden. Der interne OwnCloud-Name, wird in der gesamten OwnCloud verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste in der OwnCloud. 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.",
+"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",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index acecf27125f1a2287c37402ca570016dd5c68539..ae982ab4c567128029300af8e613bc32e82d5fe9 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -13,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" => "Προσθήκη Ρυθμίσεων Διακομιστή",
@@ -43,24 +42,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" => "Ομάδα Χαρακτηριστικων Αναζήτηση",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index c9a9ba130c6fbd2c9bcaa49127fb61f473c6b490..7f9aa0b3f1c69d5924bf3b0deca93f3da4bd682e 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -21,14 +21,11 @@
 "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",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 31d43288e5bc0ce25e6ea3bbd5bf8eb158f1b65c..f11dadfbef5321973335d680dbb49bbe62eb00e5 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -15,7 +15,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 +44,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 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.",
 "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,13 +70,10 @@
 "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",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 6925ea89a0cafbd02a2a7acdc2af438cfff7f799..8a44d3b84ad7ec94164412894891f8abe866e947 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -15,7 +15,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 +44,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,13 +70,10 @@
 "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",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 39346def039f056196426f3f0965df2cb217b9c1..7e5c0a6fec8bf3828bcf656c1dd2bf9f34c16818 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -15,7 +15,6 @@
 "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> 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 +44,20 @@
 "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.",
 "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.",
 "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.",
 "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.",
 "Base Group Tree" => "Baasgrupi puu",
 "One Group Base DN per line" => "Ãœks grupi baas-DN rea kohta",
 "Group Search Attributes" => "Grupi otsingu atribuudid",
@@ -75,13 +70,10 @@
 "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).",
 "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).",
 "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.",
 "Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
 "Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
 "Test Configuration" => "Testi seadistust",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 42f184e53902efa1b5af5bec74247e2a255bf8ed..c825a63427268e7c6023f0f58cdb1e28cd399917 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -13,7 +13,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 +42,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 +67,7 @@
 "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"
 );
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index bef13457adb7cc80bae02c2464a5aa7a84aa7e71..151e0cab285460b96b56a2c0c373b17eae8d9c8e 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -1,8 +1,13 @@
 <?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 +16,52 @@
 "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" => "راه‌نما"
 );
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 38a8b99cf7e5424a0fd82fba75cb240869b265a3..7833b301acaf32a45c7d1c7af1635b9985920c47 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -30,15 +30,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",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 11f8fbaaf4483ec1f1fb8507a81f8c0f946f7505..4820960eb369f2987496f8da75a53aacbb7a5c99 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -15,7 +15,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 +44,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,13 +70,10 @@
 "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",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 3f44ccd9bd1a0a95a2b87ec43f4dd1894f7a9897..14706db8d1d1b4afd2780574ee70ed0a9f2236e2 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -15,7 +15,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 +45,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,13 +75,13 @@
 "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",
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 361ae5e0403152cb86e1aad06104744065fc636e..26c96942cc4dca90b34194ebe5d2c47f77e76df5 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -15,7 +15,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 +44,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",
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index c04d09fc671b0f531b856845cf33e5f5f27480fc..0231e2a5961a5c8c14bc77a4c7d90ed740b358b6 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -13,7 +13,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 +42,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",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 48bcbdf589a17a16d42851bf96b822ef165a759e..18a1c3f3398532fd90f38a227cf1a2f052b677e8 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -15,7 +15,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 +45,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,13 +75,13 @@
 "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",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 53fa9ae697df3760b086c28d249b71168440f19f..8647574c524facf39f629887aa8c5d92f7f7ca9f 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -15,7 +15,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 +44,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." => "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。",
 "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属性。",
 "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属性。",
 "Base Group Tree" => "ベースグループツリー",
 "One Group Base DN per line" => "1行に1つのグループベースDN",
 "Group Search Attributes" => "グループ検索属性",
@@ -75,13 +70,10 @@
 "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ユーザにおいてのみ有効となります。",
 "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グループに対してのみ有効となります。",
 "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の設定に影響を与えます!本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
 "Clear Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピングをクリアする",
 "Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする",
 "Test Configuration" => "設定をテスト",
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index 8057f7c845550bdb99e486cf344c5dc9dca4b5c6..07cd3ad79652ecc65499f3d82d091a6b059df5b8 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -13,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" => "სერვერის პარამეტრების დამატება",
@@ -43,24 +42,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" => "ჯგუფური ძებნის ატრიბუტი",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index b8196e09d09a93f9e4adf0915b35466de90718b2..549233e20c9f6c4f28c743937ccbc4aecaf838db 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -4,7 +4,6 @@
 "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 +32,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" => "그룹 검색 속성",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 73ffedcb134637416ea928d11bbc11911020824b..38157c51f1bcb2cc433d14d703012537ea7b8e8a 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -12,7 +12,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 +41,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",
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index f8cdf694ff6f2d392f90dbcda07db766a0cee9aa..880fb41553f0e2696c67ed49e4e15fdf0884282b 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -13,7 +13,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 +41,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",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index c75aae3ea4f57fe2e0e43cc2d5e1e7af3f8b7ad4..6b42ce8116b9a891fab4f5d37ef9a79950aab753 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -15,7 +15,6 @@
 "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> 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 +44,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,13 +74,10 @@
 "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",
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 5495ab994042601e6afab97101927c4aba4e5927..ad577457a2f3e49c55be0944cf535597a114f859 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -15,7 +15,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 +44,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 +70,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:",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 22247b81005b43eb620917c4b2f4186963285777..35284b24b7ab1061a4a6c607e9f495a235e87690 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -15,7 +15,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 +45,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,13 +75,13 @@
 "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",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index aca8c8e7709bcef70c178edf6a2d6602ab9afc9d..0e5eac91c3ec2a3055f68e2b4fcfbe84d61ed2a3 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -15,7 +15,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 +44,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",
@@ -75,13 +70,10 @@
 "User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
 "Internal Username" => "Nome de utilizador 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 utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres nao necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituidos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para novos utilizadores LDAP.",
 "Internal Username Attribute:" => "Atributo do nome de utilizador interno",
 "Override UUID detection" => "Passar a detecção 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." => "Por defeito, o ownCloud deteta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).",
 "UUID Attribute:" => "Atributo UUID:",
 "Username-LDAP User Mapping" => "Mapeamento do utilizador 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." => "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
 "Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP",
 "Test Configuration" => "Testar a configuração",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 260ee610639b4b0066d0f5f6d76abd803763108a..2e03ddcca426ed5d68e7b2a7a72fff1f6234ad13 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -2,7 +2,6 @@
 "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 +25,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",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index d88b20dc46912ff228c30c8485211d3e2974f90e..a378fd2d7149f0defcbec6fb9329b980070eb8c5 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -15,7 +15,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> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
 "Server configuration" => "Конфигурация сервера",
 "Add Server Configuration" => "Добавить конфигурацию сервера",
@@ -45,24 +44,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,13 +70,10 @@
 "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" => "Тестовая конфигурация",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index fe1e14ea6fd80de1eb33be91a4992d7aa5e608d5..6c0f10f89101580de6d701f4b7d3e7cce9bfdaf3 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -15,7 +15,6 @@
 "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> 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 +44,20 @@
 "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.",
 "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.",
 "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 ",
 "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 ",
 "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,7 +70,6 @@
 "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.",
 "Internal Username Attribute:" => "Atribút interného používateľského mena:",
 "Override UUID detection" => "Prepísať UUID detekciu",
 "UUID Attribute:" => "UUID atribút:",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index aeca97038e8d455ab5759ae55728d32be4caaf74..63200df0e9c740d1cf2308b8f9bc9bd751e832b6 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -15,7 +15,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 +44,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,13 +70,10 @@
 "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",
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index b94bc83e1e477166237a64ae530da8eec4491de7..5c066e675e46eacd22b98c15ae612cc6f7846034 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -21,14 +21,11 @@
 "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" => "у бајтовима",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 6ab8a9e5a6eaedfc5d0a6b37133cd5b76eebdbaa..60bfd7829edb799dc7852b32ce5893b455971081 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -15,7 +15,6 @@
 "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> 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 +44,20 @@
 "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.",
 "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.",
 "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.",
 "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.",
 "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,13 +70,10 @@
 "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",
 "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.",
 "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ö!",
 "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",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index 997f09ca8776bb98ad62959ef6df024f749a1dd8..0eed8ca12b5d1c40f35096356005ec1738593660 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -12,14 +12,11 @@
 "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 களில் ",
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index ec279ba01e5e97dc355cf1642678b572d962129e..a3e3ec2ac49b9e54d027d3ad33af517286a687e1 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -12,7 +12,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 +39,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" => "คุณลักษณะการค้นหาแบบกลุ่ม",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 3835c72313ab32688bcaed94b6669dcc989c3ada..aee38335343c345b702d9b4f4c320cc8084c59b6 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -12,7 +12,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 +40,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",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index f92c6d5894ef6ffd87102c880a45c401f1ff9c90..56c6f615ecce729f9a52a6399d61327e084cc200 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -13,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" => "Додати налаштування Сервера",
@@ -43,24 +42,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" => "Пошукові Атрибути Групи",
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 7e598225926a4eff92474a16eeb370f87b3adcca..da7bc38e475a9732cef524df09bd4696bbc00129 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -23,22 +23,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",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index 6c60ec64e270aadb8159b4b72f35364b8cabf380..fe52e32361edacbb5c22e5f9c072485929cc9ec5 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -23,14 +23,11 @@
 "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" => "以字节计",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 675fe4dfc7529df218d7fcfeef4dd821b5eba24b..9abe4e7a9670657b44d2d4135bd59a5949401a1f 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -15,7 +15,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 +44,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,13 +70,10 @@
 "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" => "测试配置",
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index cde743f003378571879c378e972e271e7477b594..3612ca53c1dd7d4c9b4bced7de687c769776c73b 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -15,7 +15,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 +42,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" => "使用者搜索屬性",
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..e708a054099f4c9d441fef02d5a94bf1d457883e 100644
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@@ -1,4 +1,3 @@
 <?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."
+"WebDAV Authentication" => "تأكد شخصية ال WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
index 61503db8392acee4f71a4ace9351d29fab2182fc..4f2a7609d73e9a26c89bbc7f7e1248dbf4c5e1a3 100644
--- a/apps/user_webdavauth/l10n/bg_BG.php
+++ b/apps/user_webdavauth/l10n/bg_BG.php
@@ -1,4 +1,3 @@
 <?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. "
+"WebDAV Authentication" => "WebDAV идентификация"
 );
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index 339e4dbe68821e3bd8d531266ef89860980dae76..71a4f0832c6842a03ee25efc0916bfa26fa75f54 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Autenticació WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index e1f8d76e166777e522c0a694c5ca383069a3f7da..2efde08faf9779f5e92cee90a9847c2221ef1fbe 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Ověření WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
index 0d1190ba22287047a6b4b0d819a8619017be6d84..347267e53c722e7abab3278d8a50982c519858f5 100644
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@@ -1,4 +1,5 @@
 <?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."
 );
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index a6d61a497f74be86489468ba6fdc28566a397845..f0e7f5dc6ef04744382def7a8f1e9a8ab1de8911 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentifikation",
-"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: " => "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."
 );
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 21a886343f049303a4de5c7eb41cb878f8085b9e..04ab22e9c58adcaaa249774e15378b4a32de4483 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,5 @@
 <?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: " => "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."
 );
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 79bb1d13bf7a20958ad7a3de8dfbefe93913bf03..2b7cb504030f57964ffcc0d880702924ea48e136 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,5 +1,3 @@
 <?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 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
+"WebDAV Authentication" => "Αυθεντικοποίηση μέσω WebDAV "
 );
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index 18c87794d65ffa659eb8d9623ab69d51161e077a..262122cf9c37a47faef844a79120b55692f24f59 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Autenticación de WevDAV"
 );
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index cda5d7eab0562e65128a84276865804d5afc676c..262122cf9c37a47faef844a79120b55692f24f59 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Autenticación de WevDAV"
 );
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index f95b5214130f6afc457dda1e1249d327d1a45f8d..e2f359f738ecfe52fca4f7e2fc9547b8beef8534 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "WebDAV autentimine"
 );
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index 6395d7fc1e0de132b2ecd8e7182bc7477241dab4..686df69f08aae01a098b5d259a9b517a0020b5e0 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,4 +1,5 @@
 <?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."
 );
diff --git a/apps/user_webdavauth/l10n/fi_FI.php b/apps/user_webdavauth/l10n/fi_FI.php
index 61a848bcfe4bdf63f55c19d8951bf12834d5e369..40a3a069090b0df4484057be6aa360cc079af1ce 100644
--- a/apps/user_webdavauth/l10n/fi_FI.php
+++ b/apps/user_webdavauth/l10n/fi_FI.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-todennus"
+"WebDAV Authentication" => "WebDAV-todennus",
+"Address: " => "Osoite:"
 );
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index e7fad26287c334861a12784eb10c7906ee59ef55..1957bbaa30b23cd7f592b63837755ea4d3986cf9 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Authentification WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/gl.php b/apps/user_webdavauth/l10n/gl.php
index 35ed8a1969fe4da0985458c75716f6fbbb951f5a..a989f013021dddffb5c4d9831704ee8f03d328fa 100644
--- a/apps/user_webdavauth/l10n/gl.php
+++ b/apps/user_webdavauth/l10n/gl.php
@@ -1,5 +1,5 @@
 <?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."
 );
diff --git a/apps/user_webdavauth/l10n/he.php b/apps/user_webdavauth/l10n/he.php
index aee7b00f1851a1955ad982c729de32375a26151f..724acc0e3d2b93cc533f03d22a2b2a5b5970b4c0 100644
--- a/apps/user_webdavauth/l10n/he.php
+++ b/apps/user_webdavauth/l10n/he.php
@@ -1,4 +1,3 @@
 <?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 כתגובה לציון פרטי גישה שגויים ואת כל שאר התגובות כפרטי גישה נכונים."
+"WebDAV Authentication" => "הזדהות מול WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index d7de5e57f3bd374e24a55450486357dfd7b50b07..97423ce5fb733cdf8a2c4fb706bc5e7d3a7bafaa 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,4 +1,3 @@
 <?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."
+"WebDAV Authentication" => "WebDAV hitelesítés"
 );
diff --git a/apps/user_webdavauth/l10n/id.php b/apps/user_webdavauth/l10n/id.php
index 8ddf54e47350264df35acc69f5559231eb46daef..22ca0557532a15579d1b364af03fbb4cd671dc4d 100644
--- a/apps/user_webdavauth/l10n/id.php
+++ b/apps/user_webdavauth/l10n/id.php
@@ -1,4 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Otentikasi WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index 1c1e0899b1da542eafe3a19f079d08204e651bbc..0d2b3f7f7c1200b3ec26b2b102017f090b90de26 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,5 +1,5 @@
 <?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."
 );
diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php
index 703cc71489e8f261ab8e0e58e40e81e3d911e50f..047bb148335d52cc6c315ab016d7efba02d36a41 100644
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@@ -1,5 +1,3 @@
 <?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 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
+"WebDAV Authentication" => "WebDAV 認証"
 );
diff --git a/apps/user_webdavauth/l10n/ka_GE.php b/apps/user_webdavauth/l10n/ka_GE.php
index 34c502cc5ebe086b0f1c4d1bd8c011b0ccb51058..343cccd64f189d79fb51b24c9c59a008738d246c 100644
--- a/apps/user_webdavauth/l10n/ka_GE.php
+++ b/apps/user_webdavauth/l10n/ka_GE.php
@@ -1,4 +1,3 @@
 <?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 დაუშვებელი მონაცემებისთვის, ხოლო სხვა დანარჩენს დაშვებადი მონაცემებისთვის."
+"WebDAV Authentication" => "WebDAV აუთენთიფიკაცია"
 );
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
index e0431164a53469ed42e5e20b9d6503c0c4422048..ff1d4cb805e3b5e3657f0e962b3b40a2b9b248ae 100644
--- a/apps/user_webdavauth/l10n/ko.php
+++ b/apps/user_webdavauth/l10n/ko.php
@@ -1,4 +1,3 @@
 <?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이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
+"WebDAV Authentication" => "WebDAV 인증"
 );
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
index ed81efdf8bfdb0ab9f92f78afd729f04f27ce6fe..106c1d034cda6a9bbd704598d64619318142f76c 100644
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -1,4 +1,3 @@
 <?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. "
+"WebDAV Authentication" => "WebDAV autorizavimas"
 );
diff --git a/apps/user_webdavauth/l10n/lv.php b/apps/user_webdavauth/l10n/lv.php
index 7f90f64d215327a0fe74e741b2c7034cee7fcef2..24dbc9c86003003d37534c45820492099a8eb248 100644
--- a/apps/user_webdavauth/l10n/lv.php
+++ b/apps/user_webdavauth/l10n/lv.php
@@ -1,4 +1,3 @@
 <?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."
+"WebDAV Authentication" => "WebDAV autentifikācija"
 );
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index 086f8ad2ea9a68df1b9a015bf66290bd58d09355..68669710f2fe53fc5e69e87b170baaced0cd8b64 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,5 +1,5 @@
 <?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."
 );
diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
index 5c4184b33a8b2250dbe5cdcbb11e6025abc187cf..beb8af80bdac8c618e501c67e4b3e130e07e9b61 100644
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -1,4 +1,3 @@
 <?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."
+"WebDAV Authentication" => "WebDAV-autentisering"
 );
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 8c8116e5234dd21533b1c46e77bfbcbe598af64e..3ed826098da348fac8a34d7d6d08098d632bae36 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Uwierzytelnienie WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/pt_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
index 6727219db427c573286460e1eb6202dc3109b709..f5c000ae6e02f476dd1b85bea0b62b71fcd899ce 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,5 +1,5 @@
 <?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\"."
 );
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index eec1a328e1d7dd6bd3ba6643e2a58256d221a0a9..f8b491f7ed2d6f7dcbd1d5e192fcf6cbfb92881a 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,4 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Autenticação WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index bccd7d50e222651bcf589fd07c7bc5bbb09a357e..177f06154fb213441baa2d9b1414d8593f21c59b 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,4 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Autentificare WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index 20acc6e59a9bd40af89752ec0a945f6675c6ac7d..9a9b4e88f7569c31a8852512b876f00156f54d9c 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,5 +1,3 @@
 <?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 данные будут считаться неверными, при любых других ответах - верными."
+"WebDAV Authentication" => "Идентификация WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index fa63b18569a5457fd101c9f3d7a36677cccb8846..9f2d8049c125b6c9a611080e071fe414b9559588 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "WebDAV overenie"
 );
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 105fda48652c2e1f773e2f57e1c82d2fb60be700..93e6ce3fc420352e26500a1b305895e19731c0f1 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "Overitev WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/sr.php b/apps/user_webdavauth/l10n/sr.php
index 44ff078493c5617759f31deb97cea272f2265bf7..07f067c343a15888fa125191bb5fe6b462d0e2b5 100644
--- a/apps/user_webdavauth/l10n/sr.php
+++ b/apps/user_webdavauth/l10n/sr.php
@@ -1,4 +1,3 @@
 <?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 као неисправне акредитиве, а све остале одговоре као исправне."
+"WebDAV Authentication" => "WebDAV провера идентитета"
 );
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index 481b7710946ab3bd81ac70a42a66c031e021a15d..95096ce7e9594d5fb3e87adf4ef349facc8a4fc9 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,5 +1,3 @@
 <?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."
+"WebDAV Authentication" => "WebDAV Autentisering"
 );
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
index 3c84ef7104d7e52e973875d5170256e2123048f4..f73058ee42e971b15a837c9a55a19fe8f4335797 100644
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ b/apps/user_webdavauth/l10n/th_TH.php
@@ -1,4 +1,3 @@
 <?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 ให้เป็นข้อมูลการเข้าใช้งานที่ไม่สามารถใช้งานได้ ส่วนข้อมูลอื่นๆที่เหลือทั้งหมดจะเป็นข้อมูลการเข้าใช้งานที่สามารถใช้งานได้"
+"WebDAV Authentication" => "WebDAV Authentication"
 );
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index 06bf97c4b03d37c19e4ccacf8369f83d3a750640..fc593631785fa706e2a5c4bdf9cb8eb55bd360de 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,4 +1,3 @@
 <?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. "
+"WebDAV Authentication" => "WebDAV Kimlik doğrulaması"
 );
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 2f4d3c95da32376077b9b93c0d4253856bdd0c11..ade36d140f3fccb825021e69d6aa342ed08ec0e1 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,4 +1,3 @@
 <?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 як повідомлення про недійсні повноваження, а решту відповідей як дійсні облікові дані."
+"WebDAV Authentication" => "Аутентифікація WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/vi.php b/apps/user_webdavauth/l10n/vi.php
index 53f1e1c4209914c6778c3682c5a327b5eae81060..137362b95f5e5877a7be257676e169efc038ef75 100644
--- a/apps/user_webdavauth/l10n/vi.php
+++ b/apps/user_webdavauth/l10n/vi.php
@@ -1,4 +1,3 @@
 <?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ệ."
+"WebDAV Authentication" => "Xác thực WebDAV"
 );
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index ee4b88c6b49509dd21d03cb34f26966d7c3ad1db..f23a692a811d777d27f15be539a96bef9b34d714 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,5 +1,3 @@
 <?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 解释为非法身份,其他所有返回值为合法身份。"
+"WebDAV Authentication" => "WebDAV 认证"
 );
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 32166b04751f45b37b86de7213bb8f033cf51966..5e8cab265715b76de6bb4836b752b004f479f5ad 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,4 +1,3 @@
 <?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視為登入失敗,所有其他回應視為登入成功。"
+"WebDAV Authentication" => "WebDAV 認證"
 );
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..abe0b92586ca24191e9b4f99742189ba88888b1b 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -3,12 +3,18 @@
 # ownCloud
 #
 # @author Thomas Müller
-# @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
+# @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
 #
 
+#$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
 DATADIR=data-autotest
 BASEDIR=$PWD
 
+echo "Using database $DATABASENAME"
+
 # create autoconfig for sqlite, mysql and postgresql
 cat > ./tests/autoconfig-sqlite.php <<DELIM
 <?php
@@ -16,7 +22,7 @@ cat > ./tests/autoconfig-sqlite.php <<DELIM
   'installed' => false,
   'dbtype' => 'sqlite',
   'dbtableprefix' => 'oc_',
-  'adminlogin' => 'admin',
+  'adminlogin' => '$ADMINLOGIN',
   'adminpass' => 'admin',
   'directory' => '$BASEDIR/$DATADIR',
 );
@@ -28,13 +34,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',	
+  'dbuser' => '$DATABASEUSER',
+  'dbname' => '$DATABASENAME',
   'dbhost' => 'localhost',
-  'dbpass' => 'owncloud',	
+  'dbpass' => 'owncloud',
 );
 DELIM
 
@@ -44,13 +50,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',	
+  'dbuser' => '$DATABASEUSER',
+  'dbname' => '$DATABASENAME',
   'dbhost' => 'localhost',
-  'dbpass' => 'owncloud',	
+  'dbpass' => 'owncloud',
 );
 DELIM
 
@@ -60,10 +66,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',
+  'dbuser' => '$DATABASENAME',
   'dbname' => 'XE',
   'dbhost' => 'localhost',
   'dbpass' => 'owncloud',
@@ -88,21 +94,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 +119,7 @@ EOF
 			, create view
 			, create synonym
 			, alter session
-			to oc_autotest;
+			to $DATABASENAME;
 			exit;
 EOF
 	fi
@@ -153,15 +159,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 4d1950d60eec8a9d96fae119ff1fce8ea31d108c..8d978ea6ee740da984f4cabae408b85ed71b316f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -114,8 +114,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,
diff --git a/core/css/styles.css b/core/css/styles.css
index ca2d082eb32fef27e26ffbb7886d3aaa9e93242f..0dd66fb5b7c3ae3eb07ad40b5622bec63ad3c62d 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; }
@@ -20,16 +20,18 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
 	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 */ }
+
+#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; }
@@ -109,27 +111,35 @@ 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;}
@@ -164,24 +174,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 +246,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;
+}
+/* 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;
 }
-/* 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; }
+#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 {
@@ -383,7 +546,6 @@ div.jp-play-bar, div.jp-seek-bar { padding: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 }
@@ -673,7 +835,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/js.js b/core/js/js.js
index 5158b66d73a7ab849b31083d4a3a8fbba3d2bfd1..cf4e72324dc33427246365d183bae9a553f1c417 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -666,8 +666,6 @@ $(document).ready(function(){
 	$('.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 +695,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);
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..e59669cbc2b81344f5ab30d3edf753337fee3487 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -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>';
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index b18ee712cfa206148bfac61f29e173e01adb6d8a..b236e63082ca8401ee1214988ae61badecde4e04 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -102,11 +102,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" => "مجلد المعلومات",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 80f0e558a67a3f702c5f6390b5ebc96250b9e0d9..497067b09fb1d8042e8077580ae281f7c136f0f6 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -110,11 +110,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",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index b0e70938d4a5875740f314e7e4c419194c3171d5..a46bc27e4f4fcc79299c6540ca20254828c700ae 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -110,11 +110,9 @@
 "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.",
 "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>.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Složka s daty",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index aeb2995e6bdeb8cb608f9469b7db0c913d318b76..0f9d9205a60a172fa3033ea4824ad604097fb115 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -104,11 +104,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",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 2e84c3ff511d78b76997da02b6c0de76598b24cf..5646acd3dca1b2641ac35fa86c0230508a8bb71e 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,4 +1,5 @@
 <?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",
@@ -61,6 +62,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",
@@ -89,6 +91,7 @@
 "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",
+"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",
@@ -105,11 +108,10 @@
 "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>.",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Advanced" => "Avanceret",
 "Data folder" => "Datamappe",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index a8e1f81153408123eb2d00bc321725c70b7a08bb..fe4b3d5fd8edbfc63232f62d33c34b62d8d5c7b2 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -110,11 +110,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",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 9d5a7298e19d775982205df8226861ef60bd9ef5..4242bbb1aae4bed3ad7300b26b5ad0cdba9012a4 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -62,7 +62,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",
@@ -91,7 +91,7 @@
 "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 +110,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",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 2dcfa1bb69860073dccea0bc7c2b09f6f52700c8..e9bd84342f846b63decfa79da3e1269c0dc91057 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -108,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." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το 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>.",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
 "Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 00f925e5274419d0b47ed089afab6b8ce2c03c09..db611139344dac478f9c34ccef52bfed63d862cb 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -106,7 +106,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",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index ae98a019db1994cb33b9b081a1b02ddc472af299..84064e54add05b75ef31ebe6470b85d8fd0e9be7 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -110,11 +110,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",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 83123b76ea20f927b2bc727332757071e229152a..1f8f5a80127bef6865c9ab78b61c98d1b8fd36df 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -110,11 +110,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",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index ec850491b79066003934106c6706e5d8d366462d..869972a8b835fadf161b85d1727fb6b2dac8411f 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -110,11 +110,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",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 4242d975f3b6b0236a1a8dd02227554f6bf1d004..016e96b751f87f54d7829ff925ee5e6d4e3e7040 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,4 +1,5 @@
 <?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",
@@ -42,6 +43,7 @@
 "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 +62,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",
@@ -84,8 +87,12 @@
 "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 +105,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 +126,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,6 +135,7 @@
 "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."
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 02fe2ce1148900df4e10b338408b3262d37049a0..c13c6a0e345ce36832579c52e2e3f3719113db3f 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -110,11 +110,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" => "پوشه اطلاعاتی",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 23b697a25c3bb1dc28de05ec8efffba38e76270f..75209d260ef472f728561edde756e134338bd1e0 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -81,6 +81,7 @@
 "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 +103,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",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index bc8a0d281534f60480dd4b050ee76df03ea0ffd9..055b6c02e41080c79069e6cbb689761d1f5df9c2 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -110,11 +110,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",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index b55daf27c2197bce57bb1c919390bea9f017032b..02f3e80b9c86e5aa7f51220333ef71b6182e4e41 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -110,11 +110,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",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index ab002ab64e8ab940a9078426fddb22a25cda14f5..7624fd8491d23d53988add6eecba5a0a96196b81 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -105,11 +105,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" => "תיקיית נתונים",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 07d4893d6adb90fcfd75991272fd16c1fe322fe5..1d83ad54ce7261777f193a750765629614ebf7ea 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -110,11 +110,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",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 2ee9c37ec2d555320145202acc6362d6fb616e03..716cf39d5562ca96cddf47e269e0873962f2be18 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -102,11 +102,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",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index f26be1d129c8cf3488a78a4ad42a3a49458ea24b..31ccdb38e6653fbe8a438fd1ba7f20dc47020f0b 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -110,11 +110,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",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 0f445e7d85eb693c0f9efd431799c2fe80bd1f76..7c837800b0f08cf167c6f41d1e4a2eafde3c62ad 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -110,11 +110,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." => ".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" => "データフォルダ",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 877d66a0db315fa4b4ecec8ab3c74b3116ef1485..f664c9b5ce3727b57a1db47a33526fa5cc961ff2 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -102,11 +102,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" => "მონაცემთა საქაღალდე",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 2ce4f0fd377b9838188e4758aa1eb74f54079695..e534da85e9e69fd174a89b8de757da515659b527 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -60,6 +60,7 @@
 "Share with link" => "URL 링크로 공유",
 "Password protect" => "암호 보호",
 "Password" => "암호",
+"Allow Public Upload" => "퍼블릭 업로드 허용",
 "Email link to person" => "이메일 주소",
 "Send" => "전송",
 "Set expiration date" => "만료 날짜 설정",
@@ -84,8 +85,10 @@
 "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 +105,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" => "데이터 폴더",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 96a3222093f059f0527dba829619ff8ae207e70f..3cf0ef03dad271805b146a5146e3270146cd122f 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -110,11 +110,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",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 4faf7388b23b876c5e1b93c78c4089a8a641d7b3..27744dd76495dcd044c44865887bc0c1f4998f32 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -105,11 +105,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",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 9552891d7d540ef75f8a93c1bd2f69a6d380e880..5520d1ff358d525353b8c65972421b5d6a2c14e4 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -104,7 +104,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",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index dfe0cbaeb81e74cd8e6fe92fd568f17b247206e7..6780a69a22fc0bdadd1541d20581912298d8678c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,5 +1,7 @@
 <?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",
@@ -40,8 +42,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",
@@ -78,6 +82,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 +105,6 @@
 "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."
 );
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 9352f595e76d029f2bdebb3b99fcc165ef4adb4e..c2a8f049dba505048af8795762bb6b7f59a59599 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -110,11 +110,9 @@
 "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.",
 "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.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 2a4902962bd121c89df5e5d94688f4aa0f43ffd0..d1a7bb4f9ed5d323c0248e47c093a774bb591b52 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -104,11 +104,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",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 0d7c9eb21c6e09897d56c76b0d36b00f316ee081..af3bb0bf35ad345b39b2421cb98b7884a875fcc9 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -108,11 +108,9 @@
 "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.",
 "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>.",
 "Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index b36511da60038f435622222bd1f2832891e46c9c..f612301a3e8d72cd716282002ff1ad01b232c04d 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -110,11 +110,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",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index fd88b70ed4e34ef73e66b338c4362da2aa1b77c9..c16e41dce58f6e146cf631fdfba9ebf36a568ac2 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -91,6 +91,7 @@
 "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",
@@ -109,11 +110,11 @@
 "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",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 6f23cea1c2645733620d17fe0fdcb7225df51c35..8f5e56cdc829e3a5721eef1a24b0cf4e29c87a52 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -110,11 +110,9 @@
 "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>.",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
 "Advanced" => "Avansat",
 "Data folder" => "Director date",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 3369072ba87a415e62febc9cf1fb5d3cf86ccfa0..27af45212d2a5ac8ce1abeb57cce1b71b58b4656 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -110,11 +110,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" => "Директория с данными",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 582296139ecbcbfadf61c13af1d4f06f6239d394..a05c6912d2634de5d2e4f99f7cc408cc112b8fe8 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -110,11 +110,9 @@
 "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.",
 "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>.",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
 "Advanced" => "Rozšírené",
 "Data folder" => "Priečinok dát",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 548a5a3f5157be182d79f6a12acf7337af9d5ede..60d3c619fc617999b3f04cde455b9bba9339cd32 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -110,11 +110,9 @@
 "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",
 "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>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
 "Advanced" => "Napredne možnosti",
 "Data folder" => "Podatkovna mapa",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 4e6c458f4df4675064f32738840de0781952646c..25e8d6a4b6bcc8f1ea94082104cc057d3f2ecdb4 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -104,11 +104,9 @@
 "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",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index d6d4b0ff323ac1e337afed98e8d99f28e0a2c056..9fdebe6377edf4da85292371e95be2f116220f1c 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -83,7 +83,7 @@
 "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}",
@@ -110,11 +110,9 @@
 "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.",
 "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>.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Advanced" => "Avancerad",
 "Data folder" => "Datamapp",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 0a56af94182476fb68e15b1c69ba6e675b5df11f..063690d0e1f758d2c668f3458979a72bf8d6a140 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,4 +1,5 @@
 <?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",
@@ -61,6 +62,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",
@@ -89,6 +91,8 @@
 "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 +105,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,6 +133,7 @@
 "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."
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 8e67a470956505dba87f0fdd846c5eaa9a54609d..8491590787aa5ddb0b91c986c5e72abbfaa338f7 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -102,11 +102,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" => "Каталог даних",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 37ed47de765a8b3609725b3a02ed50aa421aef69..0ea7dd3a6429e7cb892cbc44015c77e12706e578 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -104,11 +104,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",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 237f0bb14bbc58ea396a760c2035cdaae5b6e2a9..26e524d016ffdb6b9e3e0f9f1d57b85c51e54f22 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -100,11 +100,9 @@
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Security Warning" => "安全警告",
-"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" => "数据存放文件夹",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 0c73fe31b3f8a9d223000314087487c8baa4c574..ecc97f000b6b2434f041914a24ea18a10c8370c9 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -110,11 +110,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" => "数据目录",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index f093a687f82bd0d8cc3c5e87ebf5acb614d1355a..2889c92f519ec27c044e4bbfdd68459f46b35017 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -110,11 +110,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." => "您的資料目錄看起來可以被 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>以瞭解如何正確設定您的伺服器。",
 "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
 "Advanced" => "進階",
 "Data folder" => "資料夾",
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..b7405ea273b7f2c6bc8b70cf8e3bc3c3f1086eb5 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>
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..ef5de653033c573f69077830e5ce6a51dfb46a3f 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -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 94eaac1b072511ce06b8a8e75216ad26c27228f1..74677c39c98fbcc4c1aeaf0f828fe1fd8542c174 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-16 06:02+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "Wolk nie gevind"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 5e5697087dc12bda460e6185bc9c564bf2c4205f..adfb6e8f93df3efd887a99fb26e4a51927cc6cea 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-11 02:16+0200\n"
-"PO-Revision-Date: 2013-07-11 00:18+0000\n"
+"POT-Creation-Date: 2013-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-22 05:55+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"
@@ -128,43 +128,43 @@ 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:465
 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
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
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 487f2119a1bad014ab48dfa025e9f07dca95d619..e89d30f4081c21f4104016c126db3708e2085776 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-16 06:02+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Toepassings"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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..bf413a9039578206c0cbcc8a309f40c577763e7d 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-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: 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..b73baa136abfa3985d52b7fb56cf194c3588ec48 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-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"
@@ -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 74a8b2381f835806115ee5630c125c78d565f474..68f6bff8aa904475d1699ae2f78efb63f381a36e 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "كانون الاول"
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "منذ دقيقة"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} منذ دقائق"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "قبل ساعة مضت"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} ساعة مضت"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} يوم سابق"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} شهر مضت"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "شهر مضى"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "خطأ"
 
@@ -246,123 +246,123 @@ msgstr "مشارك"
 msgid "Share"
 msgstr "شارك"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "محمي بكلمة السر"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "جاري الارسال ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "تم ارسال البريد الالكتروني"
 
@@ -400,7 +400,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 "إسم المستخدم"
@@ -465,7 +465,7 @@ msgstr "التوصّل محظور"
 msgid "Cloud not found"
 msgstr "لم يتم إيجاد"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,8 +494,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,65 +516,65 @@ 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 "الخروج"
 
@@ -607,7 +608,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 aa119ffa1a86735d84aec11724826874198a22d7..8241c6821201d1a1c60805a41b6aac878472b89a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "إلغاء"
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "استبدال"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "اقترح إسم"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "إلغاء"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "استبدل {new_name}  بـ  {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "تراجع"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "جاري تنفيذ عملية الحذف"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "جاري رفع 1 ملف"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" م
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "حجم"
 
@@ -212,19 +212,19 @@ msgstr "حجم"
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "مجلد عدد 1"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} مجلدات"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "ملف واحد"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ملفات"
 
@@ -305,10 +305,6 @@ msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
@@ -331,19 +327,19 @@ msgstr "يرجى الانتظار , جاري فحص الملفات ."
 msgid "Current scanning"
 msgstr "الفحص الحالي"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index ca7611d912d7b05fd9557101930773b8c7d28989..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 89ab7d24b36d64801c037d62c5a118fd7c07556c..d29eee8ffab1e42d83381a0804ab432aa6d83dba 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index ae56d8031b0180f9b470d3d37450120190ea9c55..7ad6be243be3863f5c0bafd8b76f0b76c41bc0e1 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 acee8d983e8562321ebac17e28c26a4c6519cdeb..e1901ce0fef700a266bc6a8dc9d695a6695b77ff 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "التطبيقات"
 msgid "Admin"
 msgstr "المدير"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "تحميل ملفات ZIP متوقف"
@@ -53,15 +63,21 @@ msgstr "تحميل ملفات ZIP متوقف"
 msgid "Files need to be downloaded one by one."
 msgstr "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "العودة الى الملفات"
 
-#: files.php:258
+#: 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 "تعذّر تحديده"
 
@@ -189,58 +205,62 @@ msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بم
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "منذ دقيقة"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d دقيقة مضت"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "قبل ساعة مضت"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ساعة مضت"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "اليوم"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d يوم مضى"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d شهر مضت"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "سنة مضت"
 
+#: template.php:296
+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 24955a4b6b8a39be106149dfae89f5e5020c6953..38f425ffe30186a1c25043071b5bedd2f32592d3 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 ec0467e2fd4dc38964bc2d9ac3181fe32fc7fc13..25433da0854b9973f548eeb9c63667211c1490a4 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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..888d740721fed9d6f3be3c58c08666fd0990e9bc 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 6e1ab1de274074d5939d86c6c31a3b40c7097916..3589633cd925a0e08353dfe51b5e29b80becc1fa 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-11 02:16+0200\n"
-"PO-Revision-Date: 2013-07-11 00:18+0000\n"
+"POT-Creation-Date: 2013-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-22 05:55+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"
@@ -128,43 +128,43 @@ 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:465
 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
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
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..56bb86b0ac2e4510acc17dbdb0af7ea50eecc720 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 6bb12555c07cb690b078b661c9ef4b9f83a6652f..dc5ce40ade1efec320fdd8aae780980f8912f044 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "Декември"
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "преди 1 минута"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "преди 1 час"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Грешка"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "Потребител"
@@ -465,7 +465,7 @@ msgstr "Достъпът е забранен"
 msgid "Cloud not found"
 msgstr "облакът не намерен"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "Изход"
 
@@ -607,7 +608,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 47159edeb218013a2a6134686930cdbe7bd6c784..ae11cb5e63fe47eab165890f8a2171f16f5eb340 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Изтриване"
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "препокриване"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "отказ"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
@@ -212,19 +212,19 @@ msgstr "Размер"
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} файла"
 
@@ -305,10 +305,6 @@ msgstr "Няма нищо тук. Качете нещо."
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr "Файловете се претърсват, изчакайте."
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "файл"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 6a933cd93d7ead74eebe7624a6f7b7db60eec3e1..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 ff9d127718b4cd8b9c063ed239a4190bcd0a33df..855cf3e040c34cb93388aa6ef40283322db6f64c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 02528cf85e6fef3b7f81ba9af469e07ce005e39f..ac01ba808dda0de3f53c7c1ab3acdbdaa45b0b67 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: Димитър Кръстев <dimitar.t.krastev@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
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 d485b79d0ac3b75f91be532d0d2c37688b85436d..74cc7751a414857bd6a39069ed6c2d79dca52ff7 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Приложения"
 msgid "Admin"
 msgstr "Админ"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "Изтеглянето като ZIP е изключено."
@@ -54,15 +64,21 @@ msgstr "Изтеглянето като ZIP е изключено."
 msgid "Files need to be downloaded one by one."
 msgstr "Файловете трябва да се изтеглят един по един."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Назад към файловете"
 
-#: files.php:258
+#: 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 "не може да се определи"
 
@@ -190,58 +206,62 @@ msgstr "Вашият web сървър все още не е удачно нас
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "преди 1 минута"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "преди %d минути"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "преди 1 час"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "преди %d часа"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "днес"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "вчера"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "преди %d дни"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "последният месец"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "преди %d месеца"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "последната година"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "последните години"
 
+#: template.php:296
+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 7868f3f5ac7e93e24f7605d2e304b32cb5f9dd13..862c9dce4ca46c6183f5e2c59a2828ff8e4f400f 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 5ee7a6748a29e0c4826686c60ac1da317c498c04..d57e84a8694c5b026d035af1fb4f433fca88acb8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 68525a6c6812a2b52c1478bca8c62d3c255270d8..5343b04fa699b3484f399f77183f861a7becff98 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "ডিসেম্বর"
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "১ মিনিট পূর্বে"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} মিনিট পূর্বে"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 ঘন্টা পূর্বে"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} ঘন্টা পূর্বে"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} দিন পূর্বে"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "গত মাস"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} মাস পূর্বে"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "মাস পূর্বে"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "সমস্যা"
 
@@ -246,123 +246,123 @@ msgstr "ভাগাভাগিকৃত"
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "কূটশব্দদ্বারা সুরক্ষিত"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "পাঠানো হচ্ছে......"
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "ই-মেইল পাঠানো হয়েছে"
 
@@ -400,7 +400,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 "ব্যবহারকারী"
@@ -465,7 +465,7 @@ msgstr "অধিগমনের অনুমতি নেই"
 msgid "Cloud not found"
 msgstr "ক্লাউড খুঁজে পাওয়া গেল না"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "প্রস্থান"
 
@@ -607,7 +608,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 d9a2366dc6c5a73e5ebd4944933b8f761c0bf80e..701192f58110708b31e2a826c222cf391fff3004 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "মুছে"
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "প্রতিস্থাপন"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "নাম সুপারিশ করুন"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "বাতিল"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "১টি ফাইল আপলোড করা হচ্ছে"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভ
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "আকার"
 
@@ -212,19 +212,19 @@ msgstr "আকার"
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
@@ -305,10 +305,6 @@ msgstr "এখানে কিছুই নেই। কিছু আপলো
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
@@ -331,19 +327,19 @@ msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 6d93c3f9ecaa46cd197f71580a6edceb03c71454..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 39c19b6f790567dd43280afbde2421b1d579ea85..0633b647221361affc95acc4fe2043b3e18153eb 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index ae0a1cc70d6309a1ff129294259468e575643dd7..dfac2e41a318578a727c117f13a535ba84deeaab 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 05403194a7f2a7685956ff0a9be073735e1b8bf9..d9e572a75f83df658250227e61b70f4cb25864a9 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "অ্যাপ"
 msgid "Admin"
 msgstr "প্রশাসন"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIP ডাউনলোড বন্ধ করা আছে।"
@@ -53,15 +63,21 @@ msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
 msgid "Files need to be downloaded one by one."
 msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ফাইলে ফিরে চল"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "১ মিনিট পূর্বে"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d মিনিট পূর্বে"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 ঘন্টা পূর্বে"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "আজ"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d  দিন পূর্বে"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "গত মাস"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "গত বছর"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
+#: template.php:296
+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 600024a9fea277e217a10d2689a00be0417b9257..26adca72d8e8f029c632ad562d1179f19fcc979f 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 513b49d0ec0f2b96be7ef0102f8b9ae757e51b97..776201997c2d49ccd4900e155b75f2657b1d0745 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 3761e7b8b5d1a696394d33327b6fba274758d63b..b3afdebb1604c37a734d39012bf9cf8d011dba28 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 74e6991e9a4e7861c20245981e25ea97732d0a33..8dc6dc0de23c77a3fd738caa08b00d0e100385da 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
@@ -212,19 +212,19 @@ msgstr "Veličina"
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index bdc9b45863cc37ac7a59a6dea7d33762c4892d9d..b7666f6c1ef579d2389f317255363b0047679083 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
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..4def658658b71818d2c03921cc5b1f2fef8a6c28 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 b06b433edaf227c981550fb1fcc4020c5b517616..99980e27dcd142a3cf32276ca014f111864a70a9 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+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-26 20: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"
@@ -143,55 +143,55 @@ msgstr "Desembre"
 msgid "Settings"
 msgstr "Configuració"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "fa {minutes} minuts"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "fa {hours} hores"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "fa {days} dies"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "fa {months} mesos"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Error"
 
@@ -248,123 +248,123 @@ msgstr "Compartit"
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "El correu electrónic s'ha enviat"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Accés prohibit"
 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 +496,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,65 +518,65 @@ 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"
 
@@ -609,7 +610,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 3d0dd07272ccec466561381da6cda1e9ed110cf9..a7ee5b020d3102b46a6dd90fc9fb1e44694f13d8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "Esborra"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituït {old_name} per {new_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "executa d'operació d'esborrar"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fitxer pujant"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "fitxers pujant"
 
@@ -206,7 +206,7 @@ msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Mida"
 
@@ -214,19 +214,19 @@ msgstr "Mida"
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} fitxers"
 
@@ -307,10 +307,6 @@ msgstr "Res per aquí. Pugeu alguna cosa!"
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Mida (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixa de compartir"
@@ -333,19 +329,19 @@ msgstr "S'estan escanejant els fitxers, espereu"
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "directori"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "directoris"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fitxer"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fitxers"
 
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 643e389b7f0f43d292eb916d3d57e3f54afdd1de..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 d4629359606a401257837c87d8303f9837908b0e..ba3ffec06a6838e072a667a686859015451899eb 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 7a93119b750ca0adce5a21a85d2514f0b31e60c6..056dc83807e73059a77b66a594d5bbb6c6c0e212 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index c1e4d1db8d646f91c09239b8435899f5c3f613bf..65f82183471964f9b38da2b7f369268634cb26c3 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/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: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "No heu especificat el camí"
+#: 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 "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 cba409bc22e2341e9af7daf9eaf1994bcc4d0385..1a7a91a544a9a406fbe8cb8aaf837f950905c0e5 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-26 20:40+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"
@@ -42,10 +42,20 @@ msgstr "Aplicacions"
 msgid "Admin"
 msgstr "Administració"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +64,21 @@ msgstr "La baixada en ZIP està desactivada."
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +206,62 @@ msgstr "El servidor web no està configurat correctament per permetre la sincron
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "fa %d minuts"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "fa %d hores"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "avui"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ahir"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "fa %d dies"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "el mes passat"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "fa %d mesos"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "l'any passat"
 
-#: template.php:124
+#: template/functions.php:91
 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 0fabd1c9cb130f22e2a6ecff3d9639ff99a74067..73bc843ac090199390f77ad8e54d69d38bb9928f 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 20:40+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\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,72 +395,72 @@ 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\" "
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 50b126b34fb81cd384ce978289ee91e8bd58246f..29c945320e7f139bac9b37becaae4d4f29c5b355 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: rogerc\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: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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..24f6f89a3b671137b3e941452c394f90ecb8e838 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/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 21:00+0000\n"
-"Last-Translator: rogerc\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: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "Autenticació 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 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 ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 9924d1bacb14dbf5ced3f8fad5c5fa05c78fd33a..c8f1e65a900d46fb042022268ea3aae3d9c6c7c4 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "Prosinec"
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "před minutou"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "před {minutes} minutami"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "před hodinou"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "před {hours} hodinami"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "před {days} dny"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "před {months} měsíci"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "před měsíci"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "před lety"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "Chyba"
 
@@ -248,123 +248,123 @@ msgstr "Sdílené"
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Chráněno heslem"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Odesílám ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-mail odeslán"
 
@@ -402,7 +402,7 @@ msgstr "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a
 msgid "You will receive a link to reset your password via Email."
 msgstr "Bude Vám e-mailem 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"
@@ -467,7 +467,7 @@ msgstr "Přístup zakázán"
 msgid "Cloud not found"
 msgstr "Cloud nebyl nalezen"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,65 +518,65 @@ 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 ""
 
-#: 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"
 
@@ -609,7 +610,7 @@ 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 "
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index b968f0751bc60f30da670bab95f2d976a5519815..d1f168ae5cad20077d540462f014e34923f06d9e 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "navrhnout název"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "provést smazání"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "odesílá se 1 soubor"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "soubory se odesílají"
 
@@ -206,7 +206,7 @@ msgstr "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřn
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
@@ -214,19 +214,19 @@ msgstr "Velikost"
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} soubory"
 
@@ -307,10 +307,6 @@ msgstr "Žádný obsah. Nahrajte něco."
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Zrušit sdílení"
@@ -333,19 +329,19 @@ msgstr "Soubory se prohledávají, prosím čekejte."
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "soubor"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "soubory"
 
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 6464203262c42cde0e3c1f4c91670fc29c1da713..d1284c351c846bc5d027d41afc4edec4cc087178 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbo
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba při nastavení úložiště 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>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: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>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."
 
-#: 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/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 114cacf0ca6fe30ffde84112ea0166a65e012ef0..eb58d44f787508bc604fe00771b1341723b8def2 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 3695d5a8215d2eb85ecbc8c9ee233b7fdc03667a..543ae23a2a6f147c666354b4dc3574eac6dbce47 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 11930a8b793d8417ce25bed12750ed3efa6bdf51..f5622da978c4291b70bdae1f9e10bd68577cce91 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/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: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nezadána cesta"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Verze"
+#: 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 "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 dd17e5f53ac67267f7eca5e836318a2e4f0227b5..d19bbe4bb92b93dbc939a6fe69e567c1996e5713 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Aplikace"
 msgid "Admin"
 msgstr "Administrace"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "služby webu pod Vaší kontrolou"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Stahování ZIPu je vypnuto."
@@ -54,15 +64,21 @@ msgstr "Stahování ZIPu je vypnuto."
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musí být stahovány jednotlivě."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Zpět k souborům"
 
-#: files.php:258
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 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 ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nelze zjistit"
 
@@ -190,58 +206,62 @@ msgstr "Váš webový server není správně nastaven pro umožnění synchroniz
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "před minutou"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "před %d minutami"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "před hodinou"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "před %d hodinami"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "dnes"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "včera"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "před %d dny"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Před %d měsíci"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "minulý rok"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "před lety"
 
+#: template.php:296
+msgid "Caused by:"
+msgstr ""
+
 #: 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 5e30bc975f4f241f00c27666f59ff30882d8f5a8..9de8cabe01ffb7c9f633929a61bf8d5a532dcac0 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Honza K. <honza889@gmail.com>\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: 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"
@@ -171,166 +171,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 ""
 
-#: 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é."
 
-#: 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 ""
 
-#: 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."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Locale 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 ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Spojení s internetem nefujguje"
 
-#: 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 ""
+
+#: 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"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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ů"
 
+#: 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 "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 ""
 
-#: 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 ""
 
-#: 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 "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 "
@@ -388,72 +395,72 @@ 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"
 
-#: 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"
 
-#: 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\" "
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 6f514f8d75c5355a05a658909977b12c7c37e573..efb3a159f48394b9d8310b4dfc233993ba47c5bb 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@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: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -269,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "Pole pro zobrazované jméno 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 ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -293,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "Pole pro zobrazení 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 ""
 
 #: 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 "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 ""
 
@@ -391,17 +392,16 @@ 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."
+"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/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 6cbaabde3fc067a7ea9a414897e68c37919b5a80..73e152c379e121942de223d91ef6b3c189ba990b 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/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-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-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: 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 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "Ověření 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 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 ""
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 60ca251f68a4c4ac0674f0041ba68a78869c5e9e..a7fa993d1070ba9e2a398cebff7fa43fab67ec68 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -142,55 +142,55 @@ msgstr "Rhagfyr"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 munud yn ôl"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} munud yn ôl"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 awr yn ôl"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} awr yn ôl"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} diwrnod yn ôl"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} mis yn ôl"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "misoedd yn ôl"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
@@ -226,8 +226,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:631 js/share.js:643
 msgid "Error"
 msgstr "Gwall"
 
@@ -247,123 +247,123 @@ msgstr "Rhannwyd"
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Diogelwyd â chyfrinair"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Mynediad wedi'i wahardd"
 msgid "Cloud not found"
 msgstr "Methwyd canfod cwmwl"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +495,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,65 +517,65 @@ 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"
 
@@ -608,7 +609,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 9c7b9cba19595c8dcfac5895c2e37a0b55786e88..285709f347e96dbd19082ed2c4194c5cd47604ae 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Dileu"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "amnewid"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "awgrymu enw"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "diddymu"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "newidiwyd {new_name} yn lle {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "cyflawni gweithred dileu"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 ffeil yn llwytho i fyny"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "ffeiliau'n llwytho i fyny"
 
@@ -204,7 +204,7 @@ msgstr "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Ownclo
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Maint"
 
@@ -212,19 +212,19 @@ msgstr "Maint"
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 blygell"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} plygell"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ffeil"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ffeil"
 
@@ -305,10 +305,6 @@ msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dad-rannu"
@@ -331,19 +327,19 @@ msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 msgid "Current scanning"
 msgstr "Sganio cyfredol"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 25b5868496db4cc4de1c63e4db9505713791bb51..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 1c119c71b8dffcc0a7d3a5d06ab8e4272f113b5e..38dd52e50483299b98e791b27c23b54c6736227a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 51f8d0143d2bda9520b8b895cb15ac425dd49595..9356290eb62572efb924469fd70f0e664544549d 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
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 c3969187ee3b4b90b00ee8832b2e2fa6c1f37081..ce21b1417ac21baa2d722032f4935b610fcf6441 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Pecynnau"
 msgid "Admin"
 msgstr "Gweinyddu"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "gwasanaethau gwe a reolir gennych"
 
+#: 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."
@@ -53,15 +63,21 @@ msgstr "Mae llwytho ZIP wedi ei ddiffodd."
 msgid "Files need to be downloaded one by one."
 msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Nôl i Ffeiliau"
 
-#: files.php:258
+#: 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"
 
@@ -189,58 +205,62 @@ msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau o
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 munud yn ôl"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d munud yn ôl"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 awr yn ôl"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d awr yn ôl"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "heddiw"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ddoe"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d diwrnod yn ôl"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d mis yn ôl"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "y llynedd"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
+#: template.php:296
+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 8ecdae0a360fedf9a3efda942a9ae8dc55ea55ba..25820b1996de3435823abb9b582bcc4e58274a69 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 7c34c6835380e596e18c216421a2b3f7fc71b73b..62c672e3724a3367e2326c228bbc73e8d101770f 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 d103c1728a8af19507fea4e32a81f40ae9586e34..cea754530d6b4593c94e81734bf3b154904e4fce 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 13:50+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"
@@ -22,7 +23,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."
@@ -143,55 +144,55 @@ msgstr "December"
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -227,8 +228,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:631 js/share.js:643
 msgid "Error"
 msgstr "Fejl"
 
@@ -248,123 +249,123 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
@@ -402,7 +403,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"
@@ -417,7 +418,7 @@ msgstr ""
 
 #: 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"
@@ -467,7 +468,7 @@ msgstr "Adgang forbudt"
 msgid "Cloud not found"
 msgstr "Sky ikke fundet"
 
-#: 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 "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,65 +519,65 @@ 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 ""
 
-#: 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"
 
@@ -609,7 +611,7 @@ 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 "
diff --git a/l10n/da/files.po b/l10n/da/files.po
index ae82a9e72c8ba913b4e72f6df2fa79f9ca496afb..e70e70e49e6fbf8e0be6bc5d192216fcbed3d921 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,14 +3,15 @@
 # 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-29 01:55-0400\n"
+"PO-Revision-Date: 2013-07-28 13:50+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"
@@ -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"
@@ -129,43 +130,43 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "udfør slet operation"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fil uploades"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "uploader filer"
 
@@ -205,7 +206,7 @@ msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
@@ -213,26 +214,26 @@ msgstr "Størrelse"
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} filer"
 
 #: 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"
@@ -306,10 +307,6 @@ msgstr "Her er tomt. Upload noget!"
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Fjern deling"
@@ -332,19 +329,19 @@ msgstr "Filerne bliver indlæst, vent venligst."
 msgid "Current scanning"
 msgstr "Indlæser"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "mappe"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "Mapper"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fil"
 
-#: templates/part.list.php:89
+#: 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..6b7cf9024c0026e587a943b66749a29247240e5c 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.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-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-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 18:30+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"
@@ -88,7 +89,7 @@ msgstr ""
 
 #: 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"
@@ -105,11 +106,11 @@ msgstr ""
 
 #: 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:"
@@ -125,7 +126,7 @@ msgstr ""
 
 #: 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:"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index e421f6f8527a4a412b8085531d9fbdbbe0fd0d3b..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 5e3c89e9383319cd207a1d9ce3998e5f38de1704..5b5cbad702c8e0c280577367e33cc1d9e755a37c 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 <mail@sappe.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-25 15:40+0000\n"
+"Last-Translator: Sappe <mail@sappe.org>\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,28 @@ msgstr "Kodeord"
 msgid "Submit"
 msgstr "Send"
 
-#: templates/public.php:17
+#: 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 f8792603ec6ab24512037c21d5c3d7ddfbe49c8a..a0156477f9522673dabb04a2d08c891105e6b67b 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
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 96e62e3bafb7c24f4277f4d32fc5b5b5bac87940..6ca3f4628143a87e2eb177d8e2fea6c0d84e77bf 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,14 +3,15 @@
 # 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 18:30+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"
@@ -42,10 +43,20 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +65,21 @@ msgstr "ZIP-download er slået fra."
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +207,62 @@ msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering for
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutter siden"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d timer siden"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "i går"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d dage siden"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "sidste måned"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d måneder siden"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "sidste år"
 
-#: template.php:124
+#: template/functions.php:91
 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 0376e6ae832e83d601fae2ff79d19f36ca8c1783..da7be3d4cb630e29c90f7bd8555271c7d6a84e72 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,15 +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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2013-07-29 01:56-0400\n"
+"PO-Revision-Date: 2013-07-28 17:30+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"
@@ -171,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 "
@@ -388,72 +396,72 @@ 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\" "
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 24bc2ecb554155f070bf0a87b34294ab1e5747cd..0285beaf6f80578396830469a097e0315e360d17 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\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 "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 +268,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 +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/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 dd40e9c33c503a48f0f106b991f8d7e6cb981a26..b6ea04d4be04a13454a2dc575a70b0241d1c62b6 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -5,6 +5,7 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 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
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
-"Last-Translator: Pwnicorn <pwnicorndev@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 09:40+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"
@@ -147,55 +148,55 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Fehler"
 
@@ -252,123 +253,123 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "Ö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:618
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
@@ -406,7 +407,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"
@@ -471,7 +472,7 @@ msgstr "Zugriff verboten"
 msgid "Cloud not found"
 msgstr "Cloud nicht gefunden"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -500,8 +501,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 ""
@@ -521,65 +523,65 @@ 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"
 
@@ -613,7 +615,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 e1b04c82bd4bdf22221b9618c3f1a450dafc67a6..0d09722c43037e6769a51f8c4d9a83e727caf368 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: kabum <uu.kabum@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -132,43 +132,43 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -208,7 +208,7 @@ msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vor
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
@@ -216,19 +216,19 @@ msgstr "Größe"
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -309,10 +309,6 @@ msgstr "Alles leer. Lade etwas hoch!"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Größe (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Freigabe aufheben"
@@ -335,19 +331,19 @@ msgstr "Dateien werden gescannt, bitte warten."
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "Verzeichnisse"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Datei"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Dateien"
 
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 72607ee3158849a9708c00ad98cda7e9eba6bed1..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 b30d5cc1b6cf6f6a206b2346b27b9e1d59ff9e48..8ca29758236e7040edeeaa366401a3cdc41d77f6 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Pwnicorn <pwnicorndev@gmail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 59f81dede030b0be4e08e16e4b1852ae8ed2f30a..787243f05bc2a7470e3d1294c37db88e70029531 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
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 a39864317d13a73a979bed5ed7fbf648531aa0cd..385b7e941c62d7729e273a1a2a38701cdd1e0bae 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,15 +3,16 @@
 # 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-24 15:30+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"
@@ -43,10 +44,20 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administration"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -55,15 +66,21 @@ msgstr "Der ZIP-Download ist deaktiviert."
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:258
+#: 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"
 
@@ -191,58 +208,62 @@ msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil d
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "Vor %d Minuten"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Vor %d Stunden"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "Heute"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "Gestern"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "Vor %d Tag(en)"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Vor %d Monaten"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: template.php:124
+#: template/functions.php:91
 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 e4f9746264032bcf294237297fbf841af5da8078..ecc5a27ab04cbc6b664fb9881947477c09b66e8a 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Pwnicorn <pwnicorndev@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 09:31+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"
@@ -174,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 "
@@ -391,72 +398,72 @@ 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\" "
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index ae2285f1d0e35dc8387839fe40e8b7b8f9f7d925..a7ea39ff9912616bb56d0116e498d552ebb8f87c 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\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"
@@ -92,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 ""
@@ -225,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"
@@ -245,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."
@@ -271,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"
@@ -295,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"
@@ -356,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 "Standardmäßig wird der interne Benutzername aus der UUID erstellt. Dies stellt sicher, daß der Name einmalig ist und keine Zeichen umgewandelt werden müssen. Für den internen Benutzernamen sind nur die folgenden Zeichen zulässig: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden durch ihr ASCII-Äquivalent ersetzt oder ausgelassen. Bei Kollisionen wird eine Nummer hinzugefügt/erhöht. Der interne Benutzername wird verwendet, um einen Benutzer intern zu identifizieren. Er ist auch der Standardname für das Benutzerverzeichnis in ownCloud und Teil von Remote-URLs, unter anderem für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten geändert werden. Um ein ähnliches Verhalten wie in ownCloud 5 zu erreichen, geben Sie das Benutzer-Anzeige-Namen-Attribut in das folgende Feld ein. Änderungen betreffen nur neu angelegte LDAP-Benutzer."
+"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 +375,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 das UUID-Attribut automatisch. Das UUID-Attribut wird benutzt, um LDAP-Benutzer und Gruppen eindeutig zu identifizieren. Außerdem wird der interne Benutzername basierend auf der UUID erstellt, wenn nicht anders angegeben. Sie können dieses Verhalten ändern und ein Attribut Ihrer Wahl angeben. Sie müssen sichergehen, dass das Attribut Ihrer Wahl auf Benutzer und Gruppen anwendbar und einzigartig ist. Für das Standardverhalten lassen Sie das Feld leer. Änderungen betreffen nur neu angelegte LDAP-Benutzer und Gruppen."
+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:"
@@ -393,18 +394,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 "OwnCloud nutzt die Benutzernamen, 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 vom OwnCloud-Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch OwnCloud gefunden. Der interne OwnCloud-Name, wird in der gesamten OwnCloud verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste in der OwnCloud. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Lösche niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung."
+"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"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index b428d9cdc890efc4239a940bcc0e00c723d8eb83..b9ceaaa95d0253133b38e9a58788bff3f4081e55 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -5,6 +5,7 @@
 # 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
@@ -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-12 02:03+0200\n"
-"PO-Revision-Date: 2013-07-11 07:50+0000\n"
-"Last-Translator: Pwnicorn <pwnicorndev@gmail.com>\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"
@@ -27,12 +28,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Authentifikation"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+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_DE/core.po b/l10n/de_DE/core.po
index 11e2da20d414d990c94c9f29529cc35b46e1931b..41273fc6761860c086c2e1eede681abebccc7d93 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.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-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+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-25 09:40+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"
@@ -147,55 +147,55 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "Vor 1 Minute"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -231,8 +231,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:631 js/share.js:643
 msgid "Error"
 msgstr "Fehler"
 
@@ -252,123 +252,123 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email gesendet"
 
@@ -406,7 +406,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 +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 "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"
@@ -471,7 +471,7 @@ msgstr "Zugriff verboten"
 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 +500,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,65 +522,65 @@ 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"
 
@@ -613,7 +614,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 e8ae5b2d10f5fcb526008f76449f06d63450fe7d..335e18d400ea0bdb90771f0fb4dcef9e5228391b 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -7,15 +7,16 @@
 # SteinQuadrat, 2013
 # I Robot <owncloud-bot@tmit.eu>, 2013
 # Marcel Kühlhorn <susefan93@gmx.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: kabum <uu.kabum@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -26,7 +27,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
@@ -134,43 +135,43 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -210,7 +211,7 @@ msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vor
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
@@ -218,19 +219,19 @@ msgstr "Größe"
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -311,10 +312,6 @@ msgstr "Alles leer. Laden Sie etwas hoch!"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Größe (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Freigabe aufheben"
@@ -337,19 +334,19 @@ msgstr "Dateien werden gescannt, bitte warten."
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "Verzeichnisse"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Datei"
 
-#: templates/part.list.php:89
+#: 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..ca88a9a239809a995da9c1fcf6300a0dbc65da38 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/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-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-07-18 01:54-0400\n"
+"PO-Revision-Date: 2013-07-17 09:20+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,7 +158,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 398f6cdbc63b01f2d6294583ccb8662a621fe369..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 04e8b0afca7caa5564654b1fee84247247b25a64..7b10322cb55265b5d1bb1385342329343a188824 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: JamFX <niko@nik-o-mat.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 7d8f555929119afc4ae12e9329f432fd772d8649..04b7c24056e23d937b0601d582c7a757eb2948a1 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 7d3c1a83c4472ed7dff76099fc21ffdeb139cebf..df04974b288aa9f7fd72ccd623d0ba456e3d35f1 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_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: a.tangemann <a.tangemann@web.de>\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 (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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 47bb28d9001dac41740f767c94301513003057d7..e6b3c139bcc04d97f2c791fc7e1709c8578470c2 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_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
 # 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-24 15:30+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"
@@ -42,10 +43,20 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administrator"
 
-#: defaults.php:33
+#: app.php:844
+#, 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."
@@ -54,15 +65,21 @@ msgstr "Der ZIP-Download ist deaktiviert."
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +207,62 @@ msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfigurie
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "Vor 1 Minute"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "Vor %d Minuten"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Vor %d Stunden"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "Heute"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "Gestern"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "Vor %d Tag(en)"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Vor %d Monaten"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: template.php:124
+#: template/functions.php:91
 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 980a9535d733444a1790b799f3cd96bfd44650f8..155dac105d6f33612018bbd1040f4996aae0a400 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.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-07-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: kabum <uu.kabum@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 09:31+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"
@@ -175,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 "
@@ -392,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 "Nutzen Sie diese Adresse um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</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"
@@ -474,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 f544d2b1ce6afa47bfb7136118360e9cd679c0e3..8dd1d4905f54eb609a24ad1c191f445c2d9cca8f 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\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 (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -93,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 ""
@@ -226,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"
@@ -246,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."
@@ -272,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"
@@ -296,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"
@@ -357,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:"
@@ -375,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:"
@@ -394,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 "OwnCloud nutzt die Benutzernamen, 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 vom OwnCloud-Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch OwnCloud gefunden. Der interne OwnCloud-Name, wird in der gesamten OwnCloud verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste in der OwnCloud. 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."
+"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..5e2fbb3ee7dd2f94fb19176372006d1b28ae7e3f 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -5,6 +5,7 @@
 # Translators:
 # 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 +13,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-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 (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,12 +28,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-Authentifizierung"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+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/el/core.po b/l10n/el/core.po
index 81b71aa14798742e2159d20553e433c717008f6a..59ed3f8890695157c353796e0843150d75cb7893 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -148,55 +148,55 @@ msgstr "Δεκέμβριος"
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 λεπτό πριν"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} λεπτά πριν"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 ώρα πριν"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} ώρες πριν"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} ημέρες πριν"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} μήνες πριν"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "χρόνια πριν"
 
@@ -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:631 js/share.js:643
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -253,123 +253,123 @@ msgstr "Κοινόχρηστα"
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "Αποστολή συνδέσμου με 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:618
 msgid "Password protected"
 msgstr "Προστασία με συνθηματικό"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Αποστολή..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Το Email απεστάλη "
 
@@ -407,7 +407,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 "Όνομα χρήστη"
@@ -472,7 +472,7 @@ msgstr "Δεν επιτρέπεται η πρόσβαση"
 msgid "Cloud not found"
 msgstr "Δεν βρέθηκε νέφος"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -501,8 +501,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 ""
@@ -522,65 +523,65 @@ 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 ""
 
-#: 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 "Αποσύνδεση"
 
@@ -614,7 +615,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 e78efe35a86c364a93517aeebba0e6570b07f342..7b76ec92eee6babbb371569d8ddd4864572cf21b 100644
--- a/l10n/el/files.po
+++ b/l10n/el/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Διαγραφή"
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "συνιστώμενο όνομα"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "εκτέλεση της διαδικασίας διαγραφής"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 αρχείο ανεβαίνει"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "αρχεία ανεβαίνουν"
 
@@ -205,7 +205,7 @@ msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κο
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -213,19 +213,19 @@ msgstr "Μέγεθος"
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
@@ -306,10 +306,6 @@ msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!"
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Σταμάτημα διαμοιρασμού"
@@ -332,19 +328,19 @@ msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμέν
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "κατάλογος"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "κατάλογοι"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "αρχείο"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "αρχεία"
 
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 2172f8772cf7c5a1b2819fe69bd2cf7479020aab..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 6c8f71ecb08603dbaba41a68cd09c48867d2e93b..a307bdbb8ba528fdee5d99da58e25271b44a12f4 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index aa58c8c9f8aef6af9281e5b9b89a04a3bb4937b5..99fa264f7c7a655d4a37d377ec94491655fee3fa 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index c0a78762a845887bf4584d3ae2993b9cca6fd2b3..010d0537290c2f8790441d37f450bc4d692ca504 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: 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 ad1f1343493dc9ea89c1f678dad452ea70422a06..47a64c55113408d7f4c3d61b9c21348e6c7156cb 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Εφαρμογές"
 msgid "Admin"
 msgstr "Διαχειριστής"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "Η λήψη ZIP απενεργοποιήθηκε."
@@ -54,15 +64,21 @@ msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: files.php:258
+#: 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 "δεν μπορούσε να προσδιορισθεί"
 
@@ -190,58 +206,62 @@ msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κα
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 λεπτό πριν"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d λεπτά πριν"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 ώρα πριν"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ώρες πριν"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "σήμερα"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "χτες"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d ημέρες πριν"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d μήνες πριν"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "χρόνια πριν"
 
+#: template.php:296
+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 dc6e512223947279052f25e70c106e0e536e7835..d2ce7114598ef7d5918a0450d2347ec4f7b8bebc 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 c6c60eed76decb298542b56f55f64bd16b4e08e8..05ce6737e67ee4890be21d76b2eefa0434f55ad5 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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..db3f513be64c768ace91a215487a371a5527b74f 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/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-06-25 02:04+0200\n"
-"PO-Revision-Date: 2013-06-24 20:30+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\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 "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 ""
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 80b5bdf950a2b8a5330c1b7ce44c2c797decf4c3..c4982d781984d84a26ca3f6386bba69ed40cf482 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -138,59 +138,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -247,134 +247,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -401,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 ""
@@ -466,7 +466,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,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
@@ -516,65 +517,65 @@ 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 ""
 
@@ -608,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/en@pirate/files.po b/l10n/en@pirate/files.po
index e0ed2c60a9037f4a2903e083e41e9469e30841f8..740b44636402190410661131259bae47368cb28b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 699082fa88f3c24feb44e502b77b980b39b38b85..8fae1af4ef4edc57bfe60312d57da427ab55454c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
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..fb244e8b564bdd20405031ea17d4a7b7309738f4 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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..878079dfda31ff590d7fb32205d37bd3976ea999 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-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: 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..8c4039b04d86b5b6c69eb3d7bc9221440f273870 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-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"
@@ -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 e955556d9b4ce6b49df913fbbe92b22e858bff66..48bfcc7c8b27672584ea0adefa45f5b981582b39 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "Decembro"
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekundoj antaÅ­e"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "antaÅ­ 1 minuto"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "antaÅ­ {minutes} minutoj"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "antaÅ­ 1 horo"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "antaÅ­ {hours} horoj"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hodiaÅ­"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "hieraÅ­"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "antaÅ­ {days} tagoj"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "antaÅ­ {months} monatoj"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "monatoj antaÅ­e"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Eraro"
 
@@ -248,123 +248,123 @@ msgstr "Dividita"
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "La retpoŝtaĵo sendiĝis"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Aliro estas malpermesata"
 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 +496,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,65 +518,65 @@ 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"
 
@@ -609,7 +610,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 3c1ba325ac399d3bd5c1a4d4c4cf6a4e03bf53c4..da2b56bf100279f0d8e355275112d501dd3c5ae1 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Forigi"
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "anstataÅ­igi"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataŭiĝis {new_name} per {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "plenumi forigan operacion"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 dosiero estas alŝutata"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "dosieroj estas alŝutataj"
 
@@ -205,7 +205,7 @@ msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Grando"
 
@@ -213,19 +213,19 @@ msgstr "Grando"
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
@@ -306,10 +306,6 @@ msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Malkunhavigi"
@@ -332,19 +328,19 @@ msgstr "Dosieroj estas skanataj, bonvolu atendi."
 msgid "Current scanning"
 msgstr "Nuna skano"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "dosiero"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "dosieroj"
 
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 7b60d838889575cec3c16d2119474de99938940e..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 f7900c32e9dd0eb28520950366d1d7d87697ae68..84941f56304ab062368a2c00e7df844b970d9507 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index c47acddb3371055f533dc136b8d6f02395672d12..21edd3080a998bb04039b901e915c92e4d66654a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 efe88cfc6ab800bc37ee68c021537709049cb0d1..60028aadc88377ba313953950e56c3bc371fc5c0 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Aplikaĵoj"
 msgid "Admin"
 msgstr "Administranto"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "TTT-servoj regataj de vi"
 
+#: 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."
@@ -54,15 +64,21 @@ msgstr "ZIP-elŝuto estas malkapabligita."
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:258
+#: 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 ""
 
@@ -190,58 +206,62 @@ msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dos
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "antaÅ­ 1 minuto"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "antaÅ­ %d minutoj"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "antaÅ­ 1 horo"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "antaÅ­ %d horoj"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hodiaÅ­"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "hieraÅ­"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "antaÅ­ %d tagoj"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "lastamonate"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "antaÅ­ %d monatoj"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "lastajare"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "jaroj antaÅ­e"
 
+#: template.php:296
+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 d632df7342aecd9d79b06d0c42f48a8a33707d44..b682094171e5409209c6a35975642b99fc8dcecd 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 807f26f207177d9226985a2eb098ab0c2f8b0fb0..7c3f90fac399336903308df92acf010928476628 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 d7985414885b2b5d9e9d186a62dd94e3e4fdda0e..eafc2f50f6d5fb1e61efef7c3ec3c12ff68eae89 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,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+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-25 17:30+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"
@@ -148,55 +149,55 @@ msgstr "Diciembre"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "Hace {hours} horas"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "Hace {months} meses"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Error"
 
@@ -253,123 +254,123 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
@@ -407,7 +408,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"
@@ -472,7 +473,7 @@ msgstr "Acceso prohibido"
 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 +502,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,65 +524,65 @@ 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"
 
@@ -614,7 +616,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 74bc50ffe4e05e47afced05e4364979d79b26ca3..76f2641b276f478559d01cb0bedf6d062399bf0e 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: qdneren <renanqd@yahoo.com.mx>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -133,43 +133,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Realizar operación de borrado"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "subiendo 1 archivo"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "subiendo archivos"
 
@@ -209,7 +209,7 @@ msgstr "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado po
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
@@ -217,19 +217,19 @@ msgstr "Tamaño"
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -310,10 +310,6 @@ msgstr "No hay nada aquí. ¡Suba algo!"
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Tamaño (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dejar de compartir"
@@ -336,19 +332,19 @@ msgstr "Los archivos están siendo escaneados,  por favor espere."
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "carpeta"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "carpetas"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "archivo"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "archivos"
 
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index f320ca6527b05ac16a6086135b5949c1c72c08e3..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 af3b0d189bffda34d2244a0095e0aa9127dcc6e0..6aaaffdefa01072d2000d3b1b3e51032d01170c0 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 2d4190a467ab631e7ed962d8d0fd95e4981053d0..0d157b36dadd101e1f005127631d32befe033916 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+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"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 1277356dd138de1ba45ed92e6f65a831f09e61fd..7306fcc13c86676d5fe98685ed518001cd7783a1 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/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-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-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 (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 +17,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 ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ruta no especificada"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Revisiones"
+#: 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 "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 e5d045975ded4ceaff7f7032b78b60bed72e6f21..9c16a30b4d22b58006023650aa3bd669ed2e991f 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,14 +3,15 @@
 # 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-25 17:30+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"
@@ -42,10 +43,20 @@ msgstr "Aplicaciones"
 msgid "Admin"
 msgstr "Administración"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +65,21 @@ msgstr "La descarga en ZIP está desactivada."
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +207,62 @@ msgstr "Su servidor web aún no está configurado adecuadamente para permitir si
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "hace %d minutos"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Hace %d horas"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hoy"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ayer"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "hace %d días"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "mes pasado"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Hace %d meses"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "año pasado"
 
-#: template.php:124
+#: template/functions.php:91
 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 557ac7d1b854238339386426eb28321c055db93f..b480ded9338349edf46e6054f4773946d31540c7 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -5,6 +5,7 @@
 # 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
@@ -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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: qdneren <renanqd@yahoo.com.mx>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 18:10+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"
@@ -174,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 "
@@ -391,72 +399,72 @@ 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\" "
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 92d730e378316d7024a7fcc8ebe18aa8b8a494c2..4b2d6d624911fa11f5b3a88337b00ba53ec5baf3 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: xhiena <xhiena@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: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,9 +91,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 +224,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 +244,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 ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -270,8 +271,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 +295,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 +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 "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 +374,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 +393,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..ddd6637a9350832fabf7f55fb87f4f56b1d1e808 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -11,9 +11,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 08:08+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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 (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 +26,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/es_AR/core.po b/l10n/es_AR/core.po
index bd53005ab4b944e52da73f5468f4f7b29201edca..7bcbd0813c46af4346822fe918faaa690fe7f255 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+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-25 05:56+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"
@@ -142,55 +142,55 @@ msgstr "diciembre"
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 hora atrás"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "hace {hours} horas"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Error"
 
@@ -247,123 +247,123 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "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:618
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Mandando..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "e-mail mandado"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Acceso prohibido"
 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 +495,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,65 +517,65 @@ 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"
 
@@ -608,7 +609,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 61e723fc3e8009d14165cf7ca7330755b0e6cbed..f85b60d74511a0df329d06935fe1ca148020123d 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -66,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"
@@ -74,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"
@@ -107,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
@@ -120,7 +120,7 @@ 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
 msgid "Delete"
@@ -130,43 +130,43 @@ msgstr "Borrar"
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:351
+#: 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:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
-msgstr "Eliminar"
+msgstr "Llevar a cabo borrado"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "Subiendo 1 archivo"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "Subiendo archivos"
 
@@ -196,7 +196,7 @@ 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"
@@ -206,7 +206,7 @@ msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownC
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
@@ -214,26 +214,26 @@ msgstr "Tamaño"
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} archivos"
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr "%s no se pudo renombrar"
+msgstr "No se pudo renombrar %s"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -253,7 +253,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"
@@ -289,7 +289,7 @@ msgstr "Desde enlace"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr "Archivos Borrados"
+msgstr "Archivos borrados"
 
 #: templates/index.php:48
 msgid "Cancel upload"
@@ -307,10 +307,6 @@ msgstr "No hay nada. ¡Subí contenido!"
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Tamaño (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dejar de compartir"
@@ -333,19 +329,19 @@ msgstr "Se están escaneando los archivos, por favor esperá."
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "directorio"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "directorios"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "archivo"
 
-#: templates/part.list.php:89
+#: 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 81b860056398bb6ea145598afb1f2ff7d3d5c101..68fee9017fde1e1c48d0642ac6eeecdfba343f78 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-12 02:03+0200\n"
-"PO-Revision-Date: 2013-07-11 16:40+0000\n"
+"POT-Creation-Date: 2013-07-19 01:55-0400\n"
+"PO-Revision-Date: 2013-07-18 12:20+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"
@@ -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,7 +60,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 "¡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 tus opciones personales, para recuperar el acceso a sus archivos."
+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."
@@ -71,7 +71,7 @@ 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, asegurate 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 encriptación fue deshabilitada."
+msgstr "Por favor, asegurate 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 encriptación está deshabilitada."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -98,7 +98,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 +130,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 +156,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 02baba03275f280540ab9f34c34970efd83fbe6d..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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,20 +38,20 @@ 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 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 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 "
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index c2fe728b836c59209f5f8b88f15e4127f3e4fe91..c5f5deb302c47282a743863d7451796eed4d712b 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index f4bff7bb29341a4a5f95778a4bfac3243b0d7a80..726959d0a3ed9c18e0a962bf47937855f5af3a9e 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 dd149b8ecd56c4a4efb8359a6fd590511950dfa0..fa6c2467e97ec36280a4af25e0e7c80de07ace32 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-24 15:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,15 +36,25 @@ msgstr "Usuarios"
 
 #: app.php:409
 msgid "Apps"
-msgstr "Aplicaciones"
+msgstr "Apps"
 
 #: app.php:417
 msgid "Admin"
 msgstr "Administración"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,17 +64,23 @@ msgstr "La descarga en ZIP está desactivada."
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
-msgstr "Volver a archivos"
+msgstr "Volver a Archivos"
 
-#: files.php:258
+#: 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 +109,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 +129,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 +155,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 +164,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 +176,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,15 +185,15 @@ 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:28
 msgid "Set an admin username."
-msgstr "Configurar un nombre de administrador"
+msgstr "Configurar un nombre de administrador."
 
 #: setup.php:31
 msgid "Set an admin password."
-msgstr "Configurar una palabra clave de administrador"
+msgstr "Configurar una contraseña de administrador."
 
 #: setup.php:184
 msgid ""
@@ -190,58 +206,62 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "hace %d minutos"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
-msgstr "1 hora atrás"
+msgstr "hace 1 hora"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
-msgstr "%d horas atrás"
+msgstr "hace %d horas"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hoy"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ayer"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "hace %d días"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "el mes pasado"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
-msgstr "%d meses atrás"
+msgstr "hace %d meses"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "el año pasado"
 
-#: template.php:124
+#: template/functions.php:91
 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 340a87a4960b01b7ace46c39f7b61387472daa58..9f2565ee635ffe5221dd4a57cb923e4444dac281 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-25 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"
@@ -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,72 +395,72 @@ 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\" "
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index acbaf859b17e4823659e1177ddf64d3ab36f5213..a78e6c2e490b76cc0ed1253fe9e50266449c97f5 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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:56+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 901f0fb182386ccc69e4a595d27e3cce1a637c8e..53d2e6127b3ad97823b8857ed6291b43f6e77a17 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-25 08:30+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"
@@ -143,55 +143,55 @@ msgstr "Detsember"
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutit tagasi"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 tund tagasi"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} tundi tagasi"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} päeva tagasi"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} kuud tagasi"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Viga"
 
@@ -248,123 +248,123 @@ msgstr "Jagatud"
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Ligipääs on keelatud"
 msgid "Cloud not found"
 msgstr "Pilve ei leitud"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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,65 +518,65 @@ 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"
 
@@ -609,7 +610,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 47204287e1e683d499eb0636e4950bcf1d0c7faf..4f6132eeb37af7a8757d7348d1020e378276a6c7 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "Kustuta"
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "teosta kustutamine"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fail üleslaadimisel"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "faili üleslaadimisel"
 
@@ -206,7 +206,7 @@ msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poo
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Suurus"
 
@@ -214,19 +214,19 @@ msgstr "Suurus"
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} faili"
 
@@ -307,10 +307,6 @@ msgstr "Siin pole midagi. Lae midagi üles!"
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Suurus (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
@@ -333,19 +329,19 @@ msgstr "Faile skannitakse, palun oota."
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "kaust"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "kaustad"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fail"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index f283c520f64ab6d30c3495d18d15b30a38702f8b..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 2abbaa860fe3be377e071891dbdce7c40f0cc872..42361100f7dad052657c9500cbdb86b169b6268e 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index c7cfb243ec32f0659345934ccfb8f2fd5f4095da..9734cb5c85d9f086b3e5eecffa6c41ef5df6524c 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+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"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index 6be6fc45ff4528470a63258c450caefcfae208d4..b8e03a31424d92666cfbbfba73b6cd1196167481 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/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: Rivo Zängov <eraser@eraser.ee>\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: 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 +18,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 ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Asukohta pole määratud"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versioonid"
+#: 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 "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 2d9d1110528c6a63f56968e14d6c5c437cd33f88..98146ef22537b89d9f8fc40763adc53125081e5d 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-25 08: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"
@@ -43,10 +43,20 @@ msgstr "Rakendused"
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -55,15 +65,21 @@ msgstr "ZIP-ina allalaadimine on välja lülitatud."
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:258
+#: 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"
 
@@ -191,58 +207,62 @@ msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide s
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutit tagasi"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 tund tagasi"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d tundi tagasi"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "täna"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "eile"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d päeva tagasi"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d kuud tagasi"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: template.php:124
+#: template/functions.php:91
 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 b4eccf251470eeecb55e0c88a6e09224437b7061..acd28ee25275204fd04cd4ec5ac7aab94bb73ff2 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 08: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"
@@ -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,72 +395,72 @@ 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\" "
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index cb96725d01b76a92e03e71f1f2bf8a78b30ca4ce..10fdbed025b261ed0df3305505dde96492e3559d 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@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: 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"
@@ -90,9 +90,9 @@ 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."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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..9acee7ab2cc108b3b72061c3bef9ea4533692642 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/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-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 09:20+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@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: 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"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV autentimine"
 
 #: 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 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."
+msgstr ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 8830a761f48c9b62aaa5f7ffb9310345c1f49fa9..5c3082a80b670d1aef86c11848cbc59049b89f05 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -3,13 +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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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:20+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"
@@ -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."
@@ -141,55 +143,55 @@ msgstr "Abendua"
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "orain dela {minutes} minutu"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "orain dela {hours} ordu"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "orain dela {days} egun"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "orain dela {months} hilabete"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Errorea"
 
@@ -246,123 +248,123 @@ msgstr "Elkarbanatuta"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
@@ -390,17 +392,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 +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 "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"
@@ -465,7 +467,7 @@ msgstr "Sarrera debekatuta"
 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 +476,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 +496,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,65 +518,65 @@ 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"
 
@@ -607,12 +610,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 da9dc4d444b861df552f59a76bb192f52b4da02b..f740c546a440c1a9b78ed3817337a008f3f96f7d 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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
@@ -128,43 +129,43 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Ezabatu"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "fitxategiak igotzen"
 
@@ -204,7 +205,7 @@ msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaina"
 
@@ -212,26 +213,26 @@ msgstr "Tamaina"
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
 #: 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"
@@ -305,10 +306,6 @@ msgstr "Ez dago ezer. Igo zerbait!"
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
@@ -331,19 +328,19 @@ msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "direktorioa"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "direktorioak"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fitxategia"
 
-#: templates/part.list.php:89
+#: 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..4eb3080f3fe74d6db2e34958567f0ba554ed00c8 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # 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"
-"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:50+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"
@@ -61,18 +62,18 @@ 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."
-msgstr ""
+msgstr "Ziurtatu PHP 5.3.3 edo berriagoa instalatuta dagoela eta PHPren OpenSSL gehigarria gaituta eta ongi konfiguratuta dagoela. Oraingoz enkriptazio programa ez dago gaituta."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -82,11 +83,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 +100,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 +132,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 +164,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 075af18a4eca9a1e830d8dc969e67ec2706289df..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 074d2f63c5089bcbf5e444be090f6c6ee5a03708..f2ce11b7cef11b9ae3d4e239ee0ea0a47b9483a8 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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:20+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"
@@ -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,28 @@ msgstr "Pasahitza"
 msgid "Submit"
 msgstr "Bidali"
 
-#: templates/public.php:17
+#: 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 57b05f20ee01d6195850f11b368e17b2a17477c5..ba38d12fc6c3511127354981873d112b43bf9370 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
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 aec2515505fad28a5fcdcfbc6e06c91ea9d26e4c..d91ea3a966276ce16cd1505ddbbc10d08e67fb28 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -3,13 +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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 08:00+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"
@@ -41,10 +43,20 @@ msgstr "Aplikazioak"
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -53,15 +65,21 @@ msgstr "ZIP deskarga ez dago gaituta."
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: files.php:258
+#: 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 +173,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"
@@ -189,58 +207,62 @@ msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sin
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "orain dela %d minutu"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "orain dela %d ordu"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "gaur"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "atzo"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "orain dela %d egun"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "orain dela %d hilabete"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "joan den urtean"
 
-#: template.php:124
+#: template/functions.php:91
 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 b91bb21922d25088d11ab39436dc72f2e4cf7c88..2c34f899feca649d45509966baeb8c79e31f8fe7 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: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"
@@ -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 9ed1f96d0104760a08c4eb618438139ff65736df..70f48584122248e0df5b8fb02b7b2669b2ad4472 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: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"
@@ -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 e1d0b18873737262c14eddfd11c24db1c038f99c..8909d8750f87a5996c4b7bda638ea2c9555eb1b1 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -142,55 +142,55 @@ msgstr "دسامبر"
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 دقیقه پیش"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{دقیقه ها} دقیقه های پیش"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 ساعت پیش"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{ساعت ها} ساعت ها پیش"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{روزها} روزهای پیش"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{ماه ها} ماه ها پیش"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "خطا"
 
@@ -247,123 +247,123 @@ msgstr "اشتراک گذاشته شده"
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "نگهداری از رمز عبور"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "خطا در تنظیم نکردن تاریخ انقضا "
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "خطا در تنظیم تاریخ انقضا"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "درحال ارسال ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "ایمیل ارسال شد"
 
@@ -401,7 +401,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 "نام کاربری"
@@ -466,7 +466,7 @@ msgstr "اجازه دسترسی به مناطق ممنوعه را ندارید"
 msgid "Cloud not found"
 msgstr "پیدا نشد"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +495,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,65 +517,65 @@ 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 "خروج"
 
@@ -608,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/fa/files.po b/l10n/fa/files.po
index 3809ad7c0d4390cc1de491d02795998687fb4d85..76429a8c3be5b64bcddf1ef0e7f3e2001e265313 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "حذف"
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "پیشنهاد نام"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "انجام عمل حذف"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 پرونده آپلود شد."
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "بارگذاری فایل ها"
 
@@ -205,7 +205,7 @@ msgstr "نام پوشه نامعتبر است. استفاده از \" به اش
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "اندازه"
 
@@ -213,19 +213,19 @@ msgstr "اندازه"
 msgid "Modified"
 msgstr "تاریخ"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
@@ -306,10 +306,6 @@ msgstr "اینجا هیچ چیز نیست."
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "اندازه(مگابایت)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "لغو اشتراک"
@@ -332,19 +328,19 @@ msgstr "پرونده ها در حال بازرسی هستند لطفا صبر ک
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "پوشه"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "پوشه ها"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "پرونده"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "پرونده ها"
 
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 0178f3911124c2f3d9973d969f9dfff066317e9b..28f6d3cb82a8616d45f3c0af8f849bc32efc9c3e 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\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"
@@ -38,20 +38,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 "خطا: \"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 "خطا: پشتیبانی 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 "
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index e3a219cc5e511cfbd376e9cde128026763a22f12..76c7865d81618e59cb657ec7b14172441de1d0df 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\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"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index daed0610757cba514d3b7e7f89759e8331d365d6..50b5609820f82e9656a5ad18219e45bb9dabda67 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index b97521439ce876c0ee24a5764861afbd8d28b2ba..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-10 02:13+0200\n"
-"PO-Revision-Date: 2013-07-09 09: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 "موفقیت"
-
-#: 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/fa/lib.po b/l10n/fa/lib.po
index fb235470e977744504f21da460ac5cd6e13554cf..ecfe7c69a3bf8456715a5389681130718b3264b3 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "  برنامه ها"
 msgid "Admin"
 msgstr "مدیر"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "دانلود به صورت فشرده غیر فعال است"
@@ -54,15 +64,21 @@ msgstr "دانلود به صورت فشرده غیر فعال است"
 msgid "Files need to be downloaded one by one."
 msgstr "فایل ها باید به صورت یکی یکی دانلود شوند"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "بازگشت به فایل ها"
 
-#: files.php:258
+#: 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 "نمیتواند مشخص شود"
 
@@ -190,58 +206,62 @@ msgstr "احتمالاً وب سرور شما طوری تنظیم نشده اس
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 دقیقه پیش"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d دقیقه پیش"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 ساعت پیش"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ساعت پیش"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "امروز"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "دیروز"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d روز  پیش"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "ماه قبل"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%dماه پیش"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "سال قبل"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "سال‌های قبل"
 
+#: template.php:296
+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 080dda2213e2b6967d981b619e4c83082c9b58b1..df8ab0bbd509c8f5fdf41b292a038032b21829db 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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
+"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 با صفحه  cron.php در ریشه owncloud ."
+"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 "از طریق 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,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/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 1f73346dc7375b9a0f17fa3480d33d15cec3c55d..07127fe3c003f0099cd6b54e8345e4c96c5a616b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 fb3e2b908a94f83307c4517f0165901591dba858..f73b8487597cbb43790538a3649550602d245770 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/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-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 04:30+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +23,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 اعتبار کاربر را به این آدرس ارسال می کند. این افزونه پاسخ ها را بررسی می کند و کد وضعیت 401 و 403 HTTP را به عنوان اعتبار نامعتبر، و تمام پاسخ های دیگر را به عنوان اعتبار معتبر تفسیر می کند."
+msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index e0782e62780ba639721242e5cf4129c8dd10d46d..6bee44d1903872a17133c1a9c72fe4248cc998f7 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+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-25 06:10+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"
@@ -142,55 +142,55 @@ msgstr "joulukuu"
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuuttia sitten"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} tuntia sitten"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} päivää sitten"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} kuukautta sitten"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Virhe"
 
@@ -247,123 +247,123 @@ msgstr "Jaettu"
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 ""
 
-#: 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:618
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Lähetetään..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Sähköposti lähetetty"
 
@@ -391,7 +391,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 +401,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"
@@ -466,7 +466,7 @@ msgstr "Pääsy estetty"
 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 +495,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,65 +517,65 @@ 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"
 
@@ -608,7 +609,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 553efe97eeaae919d851ade820196727bf9dbc32..9181d3631a40bdda24e73c99f77659b4e168a644 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -129,43 +129,43 @@ msgstr "Poista"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "ehdota nimeä"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "suorita poistotoiminto"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Koko"
 
@@ -213,19 +213,19 @@ msgstr "Koko"
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
@@ -306,10 +306,6 @@ msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Koko (Mt)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Peru jakaminen"
@@ -332,19 +328,19 @@ msgstr "Tiedostoja tarkistetaan, odota hetki."
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "kansio"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "kansiota"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "tiedosto"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "tiedostoa"
 
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 5f62a188ec7081c0f0760cefed0db2c5895fee6f..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 4933c6f66a880d62232303d03c5889031f875471..317486daa3fb719fa047999e1d0300417adc1002 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 88202b57cbe9d6b26e6fe6a3926487c78bec6c50..87875e904c7f37dcb0534df57e9a5715b84ebfb2 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:00+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"
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 6452ece8610ab47daca70467e57e5b30d4da931a..ca512563c65e64f929cc18fc3d021fb0a38df304 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Sovellukset"
 msgid "Admin"
 msgstr "Ylläpitäjä"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
+#: 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ä."
@@ -54,15 +64,21 @@ msgstr "ZIP-lataus on poistettu käytöstä."
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittäin."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: files.php:258
+#: 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ää"
 
@@ -190,58 +206,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuuttia sitten"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d tuntia sitten"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "tänään"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "eilen"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d päivää sitten"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "viime kuussa"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d kuukautta sitten"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "viime vuonna"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "vuotta sitten"
 
+#: template.php:296
+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 82441cb66396f85ff3971a46583a69a4503ea8f0..1658f4d7d06cb14318dfc4fe131dca87d588ee6b 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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: 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"
@@ -170,166 +170,173 @@ msgstr "Anna kelvollinen salasana"
 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,72 +394,72 @@ 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\" "
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 1c93d7f5083ac956931ecd8bc1cce4ffe34862bc..fe9736f8089d9175437478e4c6c4cb60b48da02b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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..d12fc9eddf3334204b58dd444cd1cce8ad39676a 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-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"
@@ -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 ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 6c9cde267efc5fa0f2993ed721a3e8057c4b7e89..da213b7868d67c5fd389ddca211b67c0d434f869 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -146,55 +146,55 @@ msgstr "décembre"
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "il y a une minute"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "il y a {minutes} minutes"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "Il y a {hours} heures"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "il y a {days} jours"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "Il y a {months} mois"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Erreur"
 
@@ -251,123 +251,123 @@ msgstr "Partagé"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:620
+#: js/share.js:631
 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:643
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email envoyé"
 
@@ -405,7 +405,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"
@@ -470,7 +470,7 @@ msgstr "Accès interdit"
 msgid "Cloud not found"
 msgstr "Introuvable"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -499,8 +499,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,65 +521,65 @@ 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"
 
@@ -612,7 +613,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 ffda287fbd1939cfa04e51e08b67021274d1f7ca..5cc9e734620b8154beb165b647cd89e306aa5df9 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -131,43 +131,43 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Suggérer un nom"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a été remplacé par {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "effectuer l'opération de suppression"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fichier en cours d'envoi"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "fichiers en cours d'envoi"
 
@@ -207,7 +207,7 @@ msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Taille"
 
@@ -215,19 +215,19 @@ msgstr "Taille"
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} fichiers"
 
@@ -308,10 +308,6 @@ msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Taille (Mo)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ne plus partager"
@@ -334,19 +330,19 @@ msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "dossier"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "dossiers"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fichier"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fichiers"
 
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 555e6c792168c108f78383eb859a1d1690fb2be0..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 01634779160cc7ba4d732685139dfd51962bca30..3991b7e5236f9fc656fcc0fdb38dd8b7292993ce 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: square <benben390-390@yahoo.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 2bc2d62e1c47bfcd858d29ede0069a9fb4e2d57c..94226623c74985f2fec4af10dc908a1fb8f9deda 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
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 1fd49428195e4107900f5a06be0e65082f617e3b..dcb8bc19a2b8c6952f5f410b60a8b382e900ad57 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Applications"
 msgid "Admin"
 msgstr "Administration"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
+#: 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é."
@@ -54,15 +64,21 @@ msgstr "Téléchargement ZIP désactivé."
 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:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +206,62 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "il y a une minute"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "il y a %d minutes"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Il y a %d heures"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "aujourd'hui"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "hier"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "il y a %d jours"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "le mois dernier"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Il y a %d mois"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "l'année dernière"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
+#: template.php:296
+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 b6c0dde898872ecb3b7d046215d4ec4affce6829..8e95507a9487c5213be3ef5053d9fa2ee7db7e5b 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-25 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"
@@ -173,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 "
@@ -390,72 +397,72 @@ 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\" "
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 084f4d49da57b72e01eb5a94c9185fa8af126c1e..3d914eb3c70c231e938a21f6fc4c2bdde394881b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: plachance <patlachance@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: 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 05359f27645c17bcd220daf865706012195962ac..735075719cc8726bdc22a3835ed377592a49bbc5 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 08:40+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"
@@ -142,55 +142,55 @@ msgstr "decembro"
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "hai {minutes} minutos"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Vai 1 hora"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "hai {hours} horas"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "hai {days} días"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "hai {months} meses"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Erro"
 
@@ -247,123 +247,123 @@ msgstr "Compartir"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Correo enviado"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Acceso denegado"
 msgid "Cloud not found"
 msgstr "Nube non atopada"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +495,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,65 +517,65 @@ 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"
 
@@ -608,7 +609,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 31787f550600242b75cfe27e39d4322c6199ffad..b4676e5d42f2aee64348359a190cc040912e49a9 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituír {new_name} por {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "realizar a operación de eliminación"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "Enviándose 1 ficheiro"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "ficheiros enviándose"
 
@@ -205,7 +205,7 @@ msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Own
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
@@ -213,19 +213,19 @@ msgstr "Tamaño"
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
@@ -306,10 +306,6 @@ msgstr "Aquí non hai nada. Envíe algo."
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Tamaño (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de compartir"
@@ -332,19 +328,19 @@ msgstr "Estanse analizando os ficheiros. Agarde."
 msgid "Current scanning"
 msgstr "Análise actual"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "directorio"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "directorios"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ficheiro"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 6d6843fcce95029685e957635f439d527aac9afb..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 1df61ba86b4624a0fbe739dcad008bb694f2da2e..f2c53603c68c430e4a93d755a4ba6e48913b8918 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+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"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 554cb9299d5fadc06dff7359c07b0fe0a23f3560..db4b5ffc325bf71fa0f24773f7ad7bf56614e25b 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
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 b15132d2f2f48e04e8fe952bb4d057fa93a7f898..59aeeae8efa81cbc6ce574544413d0c943e6a1b8 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-24 06:10+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"
@@ -42,10 +42,20 @@ msgstr "Aplicativos"
 msgid "Admin"
 msgstr "Administración"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +64,21 @@ msgstr "As descargas ZIP están desactivadas."
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +206,62 @@ msgstr "O seu servidor web non está aínda configurado adecuadamente para permi
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "hai %d minutos"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Vai 1 hora"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Vai %d horas"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hoxe"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "onte"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "hai %d días"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "último mes"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Vai %d meses"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "último ano"
 
-#: template.php:124
+#: template/functions.php:91
 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 3081f01681d419d5076a18d7b8a14a176343b0af..49fcaffcd5ef155cf27d07c8d4a60e6a18c45d61 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 09:00+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"
@@ -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,72 +394,72 @@ 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\" "
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 952fb0937fbc0438c4c0018bee8513dac3348d3f..73ad4feb1e67ac2c025f87bb83e1767a998f17e2 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 11:00+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 549c07881e83b37c9f50272d1ce035ff9ee6cd0e..5aab5ba861c9ae843248524744692d6d9df1c55b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -142,55 +142,55 @@ msgstr "דצמבר"
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "לפני דקה אחת"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "לפני {minutes} דקות"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "לפני שעה"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "לפני {hours} שעות"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "לפני {days} ימים"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "לפני {months} חודשים"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "חודשים"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "שגיאה"
 
@@ -247,123 +247,123 @@ msgstr "שותף"
 msgid "Share"
 msgstr "שתף"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "מוגן בססמה"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "אירעה שגיאה בביטול תאריך התפוגה"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "מתבצעת שליחה ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "הודעת הדוא״ל נשלחה"
 
@@ -401,7 +401,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 "שם משתמש"
@@ -466,7 +466,7 @@ msgstr "הגישה נחסמה"
 msgid "Cloud not found"
 msgstr "ענן לא נמצא"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +495,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,65 +517,65 @@ 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 "התנתקות"
 
@@ -608,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/he/files.po b/l10n/he/files.po
index e09c8840efd356924ba385f47e79c70217f50273..e98a0126d157475ca063aef88bf1bd883b76615b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "מחיקה"
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "החלפה"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "הצעת שם"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ביטול"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} הוחלף ב־{old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "ביצוע פעולת מחיקה"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "קובץ אחד נשלח"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "קבצים בהעלאה"
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "גודל"
 
@@ -213,19 +213,19 @@ msgstr "גודל"
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} קבצים"
 
@@ -306,10 +306,6 @@ msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "הסר שיתוף"
@@ -332,19 +328,19 @@ msgstr "הקבצים נסרקים, נא להמתין."
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "קובץ"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "קבצים"
 
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 8a4ad50777fb444c9e11564711291cc263aeab48..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 5766019c79643ee6259d2b20093feea4aede0e10..ed15a0077f5636c616c5750536a170e4a4b87637 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index bb0774633cadd4a165e09751c0166f02cb15fdf7..682d384b99f410093bb209785c4800ba57337c6e 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
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 a45d01f120e651ec54d8e920e2fc2962e198e476..bb79451d05bef669455f50d6c3dd84bf9d3e8b23 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "יישומים"
 msgid "Admin"
 msgstr "מנהל"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "הורדת ZIP כבויה"
@@ -53,15 +63,21 @@ msgstr "הורדת ZIP כבויה"
 msgid "Files need to be downloaded one by one."
 msgstr "יש להוריד את הקבצים אחד אחרי השני."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "חזרה לקבצים"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכר
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "לפני דקה אחת"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "לפני %d דקות"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "לפני שעה"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "לפני %d שעות"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "היום"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "אתמול"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "לפני %d ימים"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "לפני %d חודשים"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "שנים"
 
+#: template.php:296
+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 b448c5c7656db7e050d99632a027219a6bbeb6e6..1af965a09637fa551eaed45b6586a95dce1eb57b 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 c6f155da5f4ed5fe735680f99d8021ab2813b3d7..963a7defc75cddfe00720751ef788bfd4f61bfd2 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 585d638e5c25c11233272e192db06be73fce0fa3..1885e83cf20bc8ccc481bb985000f64a428fdf1a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -142,55 +142,55 @@ msgstr "दिसम्बर"
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -247,123 +247,123 @@ msgstr ""
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -401,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 "प्रयोक्ता का नाम"
@@ -466,7 +466,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "क्लौड नहीं मिला "
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,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
@@ -516,65 +517,65 @@ 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 "लोग  आउट"
 
@@ -608,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/hi/files.po b/l10n/hi/files.po
index bc7aec79fdea0d44646c131c82606bb84c3d47dc..303d4b30b479a4eeb5a724857685b959d18db6cc 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index 72a7002e820e0cc93b02f97fcb084d4cdbbefd82..c2ebbcdce96bf8505c49fc479308cb8e704c36d3 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
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 811b01669f04ba41585af1aa08288446b8e89088..4c585172851b9cd22d598adae4a1bb9ec3b22d17 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-16 06:02+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Apps"
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 d6517b6f97c4ba7793c3702c2197c02f7d3d63d1..f522a760cf67b8bc2f3d6a1879af986b7b7b1b6a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 621c283050a5fb5f0a9938fed99b8a7b28f69b4b..c943c1679ce13749467ed438df2c1fc1f87a0a13 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 f15f6d0bd99b4124e3d5a7a50ffea663dc0f71ea..4ec6c0bfd82e78dba04cf58da63ac44b26fa78d7 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "Prosinac"
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "godina"
 
@@ -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:631 js/share.js:643
 msgid "Error"
 msgstr "Greška"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr "Pristup zabranjen"
 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 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 745a02f39261f7e18b8d1a0751eb06803cab5468..c9259858fde5cd4008b50704b6de40fbfd296973 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "predloži ime"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 datoteka se učitava"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "datoteke se učitavaju"
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
@@ -212,19 +212,19 @@ msgstr "Veličina"
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Makni djeljenje"
@@ -331,19 +327,19 @@ msgstr "Datoteke se skeniraju, molimo pričekajte."
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "datoteka"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 239b5cf080f17fb5f6b3be83b47379ea1a058814..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 2b2c8e9fa9377d4db689cccd939f993e4bd49051..060175dfc04e9cbefff2a3852a4de3a734dfdbb0 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 32042e85451ca33d29a553f89fb6516463c957f7..8fa36bb7945249b282d8410265f1490824f55c06 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
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 b80c5f06aeba1f6381230332b7c5393bc8efc4b1..d7ad1c61c971607bbcc97dfc653e96cd0bb75316 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Aplikacije"
 msgid "Admin"
 msgstr "Administrator"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "danas"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "jučer"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "godina"
 
+#: template.php:296
+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 418552ae12d52b91ebce5a2abab184b12e91fc95..b7d80dba4fe38da212262724055a25d599038031 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 536bdabd4163e1ed360880a5db807e7f5e78e0fc..2d361d82bb87d8dace10e5c2ca375a342790a2af 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 fc30fcb60818371c5787f34222ab7f5439a97fee..92d3fb95e78ee187249e1c6c53da17396a12efc6 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 18:30+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"
@@ -142,55 +143,55 @@ msgstr "december"
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} perce"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 órája"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} órája"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} napja"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} hónapja"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Hiba"
 
@@ -247,123 +248,123 @@ msgstr "Megosztott"
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "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:618
 msgid "Password protected"
 msgstr "Jelszóval van védve"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerült a lejárati időt törölni"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Nem sikerült a lejárati időt beállítani"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Küldés ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Az emailt elküldtük"
 
@@ -401,7 +402,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"
@@ -466,7 +467,7 @@ msgstr "A hozzáférés nem engedélyezett"
 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 +496,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,65 +518,65 @@ 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"
 
@@ -608,7 +610,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 f3efb05434de02917d28c0095263a812e2b58b82..ffe9dd4a97b13720199aaa1ca2d6ecf1faa7f609 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Törlés"
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "írjuk fölül"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "legyen más neve"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:351
+#: 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:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "a törlés végrehajtása"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fájl töltődik föl"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "fájl töltődik föl"
 
@@ -205,7 +205,7 @@ msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára le
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Méret"
 
@@ -213,19 +213,19 @@ msgstr "Méret"
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} fájl"
 
@@ -306,10 +306,6 @@ msgstr "Itt nincs semmi. Töltsön fel valamit!"
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "A megosztás visszavonása"
@@ -332,19 +328,19 @@ msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "mappa"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "mappa"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fájl"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fájlok"
 
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 6b6179e6dc089f8510f5f872d2c5f77821c37d41..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 723b2138da6a5ae6a0e6af15f917eab0bb5f0fe1..3c44de68d368285c493f703d6d7385d7798e928d 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 7503f89c15c7efdc3a6add0cf50723c2ef30af2a..a223f7db61f0299b2427d43b514fe277f1362e47 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index 39f58c0a5db318e40a101cdbac1166893fd5bb7c..36ab19be9966a30ba7f28286c7227bfca30cf8be 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/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: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nincs megadva az útvonal"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Az állományok korábbi változatai"
+#: 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 "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 0367f4f3188550f04df36318e652690d96ed9951..728130342ca3a8ea1ca1b7961b70211828d3fb67 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-26 19:20+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"
@@ -42,10 +43,20 @@ msgstr "Alkalmazások"
 msgid "Admin"
 msgstr "Adminsztráció"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +65,21 @@ msgstr "A ZIP-letöltés nincs engedélyezve."
 msgid "Files need to be downloaded one by one."
 msgstr "A fájlokat egyenként kell letölteni."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Vissza a Fájlokhoz"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +207,62 @@ msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d perce"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 órája"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d órája"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "ma"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "tegnap"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d napja"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d hónapja"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "tavaly"
 
-#: template.php:124
+#: template/functions.php:91
 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 de7fcd316d188650824cc0a85671aea8b8a69953..55cb8bceb3603f6ddfd8a837af8937b7b46465b3 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 19:30+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,72 +396,72 @@ 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\" "
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 9ce1583e3bf28f01c0dd1fd03b3518d9f172510a..c9d9d73f5884c395799bcf55f21131570c920f8b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@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: 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..d9387c503c8a4001406d9779d88eff9811960f70 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€"
 msgid "December"
 msgstr "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 96c6b4a7fb89eee54f4468665bc8b05bae544b1f..df5bafb76cd6411fcb6ab7f3b169a4197a47b0ac 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index aedc12bc2468c386750133f0892e1d0ba21fc642..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-17 02:19-0400\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 341fe29d7922e396d33eed0b4f77257dbf7144f8..b0ff019c8d5a9e498b237bb844f814991c7e0912 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index b5ade7baead7ae27d18cc0469c3ec15ab46ca588..d25cfb36f9c737088bf22ee0488b2260cfaf24cc 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.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-17 02:19-0400\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"
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..40f120e53550473bd0e238f7b6565c61fa9dc32c 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 a3f359e76dfd7967333a14c4fd7977d5d1c5812d..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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 291e3472e04277c3a9e89d0775922c1ebf9803e7..8e8c1d777b9bcb7dbad60c57e850debe433904f1 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Error"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr "Accesso prohibite"
 msgid "Cloud not found"
 msgstr "Nube non trovate"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 3ccd90b7fe95abca0bb28dee0d884fcbc1cd0a69..02cad9734fc123dfba52879bba6fd5615a9b97f6 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimension"
 
@@ -212,19 +212,19 @@ msgstr "Dimension"
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr "Nihil hic. Incarga alcun cosa!"
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 5c58fac771492367dca0f995c57b7706d025e175..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 25dad43a345abc8ad1c51e85e499f1f596b9c93f..2247eb9098fadd28a111546e68ef9e5b7168ee9a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 8da3c80946f7662ab5ea9278bc7b61610ca6815f..c3bac94d930d57a763fc659b6496c6bff6b1b8ec 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
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 1481c06a51a7e8e713b7089391ea07862be8688f..283c448b8e61780dd3f524d95830ab63c4a2c228 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Applicationes"
 msgid "Admin"
 msgstr "Administration"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 682d7dde10ed28a3f6dc6e7b782a484e92647027..d13f934dd37d1315f4cd139da717c96a17ae0315 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 576be4296626fcd8b6617684922bbf98a5649d07..69e81595ead85966a33babd3c42b03066baeabc9 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 0f474a7dbda03142195020d6362e68d8de33cb75..177a8b8a1cd1045a4b1578324d412db9762cca77 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 menit yang lalu"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} menit yang lalu"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 jam yang lalu"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} jam yang lalu"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} hari yang lalu"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} bulan yang lalu"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -225,8 +225,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:631 js/share.js:643
 msgid "Error"
 msgstr "Galat"
 
@@ -246,123 +246,123 @@ msgstr "Dibagikan"
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Dilindungi sandi"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Galat ketika menyetel tanggal kedaluwarsa"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email terkirim"
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr "Akses ditolak"
 msgid "Cloud not found"
 msgstr "Cloud tidak ditemukan"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,8 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 cb98864a28c71e2a1c3a291fa7323b7a8d49affc..d200700fe9bd56860f131c9b8d64201556050b59 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Hapus"
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sarankan nama"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Lakukan operasi penghapusan"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 berkas diunggah"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "berkas diunggah"
 
@@ -204,7 +204,7 @@ msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Ukuran"
 
@@ -212,19 +212,19 @@ msgstr "Ukuran"
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} folder"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 berkas"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} berkas"
 
@@ -305,10 +305,6 @@ msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Batalkan berbagi"
@@ -331,19 +327,19 @@ msgstr "Berkas sedang dipindai, silakan tunggu."
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "berkas"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "berkas-berkas"
 
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 54491ea6e8b01c8e1cc8bf9c88991b0f0cef3a4d..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 8ef86f511726f41fba1e55a3db9af9ba0678e1e6..6741367871dd453b1ae23e7d5ae235f689fc4ce8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index c7b657eb9f71d7a3075d8c7233774ffeabfbf1c3..37e3b87e7e833c4ca9cf98c865859432e643aa8f 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 b2ac1efcb8c0b1c2f52349b3d2cd50c02b1d826f..7d7e86cd29ad9cf1cd47e5cfeeae32c4fd6959e3 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Aplikasi"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "layanan web dalam kontrol Anda"
 
+#: 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."
@@ -53,15 +63,21 @@ msgstr "Pengunduhan ZIP dimatikan."
 msgid "Files need to be downloaded one by one."
 msgstr "Berkas harus diunduh satu persatu."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Kembali ke Daftar Berkas"
 
-#: files.php:258
+#: 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"
 
@@ -189,58 +205,62 @@ msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sin
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 menit yang lalu"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d menit yang lalu"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 jam yang lalu"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d jam yang lalu"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hari ini"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "kemarin"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d hari yang lalu"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d bulan yang lalu"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
+#: template.php:296
+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 6aa3685c99c1fc0aa31ce89c4dcf93e207b0dcad..edfbd93638509a7327cad8f6a154133e0281bf47 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 9c260186913c81e8d139b11195316fcaf8412a50..2cf3f355a05bd058999113c56ea42b7d9a272cd3 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 7b90f473831cb50e355cd3004355c4aa2ccf5fd4..4d63b5e0f0a5796e7b9f599e233b9457098a5168 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -142,55 +142,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "Fyrir 1 mínútu"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} min síðan"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "fyrir {hours} klst."
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dagar síðan"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "fyrir {months} mánuðum"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Villa"
 
@@ -247,123 +247,123 @@ msgstr "Deilt"
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Villa við að aftengja gildistíma"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Villa við að setja gildistíma"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Tölvupóstur sendur"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Aðgangur bannaður"
 msgid "Cloud not found"
 msgstr "Ský finnst ekki"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,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
@@ -516,65 +517,65 @@ 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á"
 
@@ -608,7 +609,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 813e30b78f1f0210a020a7f61709cabe60d103e5..29c1fd716351f9ab6db1a5f7ba4472702cf2f3b0 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Eyða"
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 skrá innsend"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Ownclou
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Stærð"
 
@@ -212,19 +212,19 @@ msgstr "Stærð"
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} skrár"
 
@@ -305,10 +305,6 @@ msgstr "Ekkert hér. Settu eitthvað inn!"
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Hætta deilingu"
@@ -331,19 +327,19 @@ msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 msgid "Current scanning"
 msgstr "Er að skima"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index adbd2f9dffb644eb961c397c90b0239b1e83f9f7..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 aa3c93d591993b2e3154b9e9ee42783798bd0153..d27d881ebb1558584ccef76bd1a2ee0f7cc295e0 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index f1e909a148bfe2783e52b1a3534204427bd7b237..e9aa65df00ec0fc905854de5145809a63b10c50e 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 27bab1b43fb64f4caf921c0007f5d4d485124911..ad927007a61f4c081a2e198b7fe448b6c4999ebc 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Forrit"
 msgid "Admin"
 msgstr "Stjórnun"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "vefþjónusta undir þinni stjórn"
 
+#: 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."
@@ -53,15 +63,21 @@ msgstr "Slökkt á ZIP niðurhali."
 msgid "Files need to be downloaded one by one."
 msgstr "Skrárnar verður að sækja eina og eina"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Aftur í skrár"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "Fyrir 1 mínútu"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "fyrir %d mínútum"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "fyrir %d klst."
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "í dag"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "í gær"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "fyrir %d dögum"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "fyrir %d mánuðum"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "síðasta ári"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "einhverjum árum"
 
+#: template.php:296
+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 8700391e2555d4e4bb30ed5ad68c2dbbbdcb4402..c9bd7610fa6a154f39b6fa0bf4116ed638e6ebee 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 ccad0cb2ea7a03a961ba54f692959b1faecd1813..69d38cfaa3d89c0105fde9557e0ea07a0dbd64d1 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: Magnus Magnusson <maggiymir@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: 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 8e4c4d860cdc3d0966952a6b360eba992defce8c..9d25e7fd0ba85c235669e675606edd99d692efbf 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 16:40+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"
@@ -144,55 +144,55 @@ msgstr "Dicembre"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "Un minuto fa"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuti fa"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} ore fa"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} giorni fa"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} mesi fa"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Errore"
 
@@ -249,123 +249,123 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
@@ -403,7 +403,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"
@@ -468,7 +468,7 @@ msgstr "Accesso negato"
 msgid "Cloud not found"
 msgstr "Nuvola non trovata"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -497,8 +497,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,65 +519,65 @@ 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"
 
@@ -610,7 +611,7 @@ 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 "
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 5794120594299927a95561b16c431c57598ae7d7..26223099486ae191341a736e3769e9d0847383b4 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "esegui l'operazione di eliminazione"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 file in fase di caricamento"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "caricamento file"
 
@@ -206,7 +206,7 @@ msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownClo
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimensione"
 
@@ -214,19 +214,19 @@ msgstr "Dimensione"
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} file"
 
@@ -307,10 +307,6 @@ msgstr "Non c'è niente qui. Carica qualcosa!"
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Dimensione (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
@@ -333,19 +329,19 @@ msgstr "Scansione dei file in corso, attendi"
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "cartella"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "cartelle"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "file"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "file"
 
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 7408154bc3fd0c5efc5e314bee1c70af6ab6bb25..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 98d538f46048bf9bfabc236bd4f41e59f3d756e1..5f93f56ae9ce3489ac0b921706a22a64ebda3978 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index b44df1c806f04eefa830b41be55c6f43a61095d3..1aa1b30665a1f835f468e6d77735aaa53ed3369a 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 d9a0065d2fe1e8eaa277b74ad7c649ac5bb0cb97..e99e2c2da9db7c2ae4941fcd4e00c8d787042a07 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 16:40+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"
@@ -42,10 +43,20 @@ msgstr "Applicazioni"
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +65,21 @@ msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +207,62 @@ msgstr "Il tuo server web non è configurato correttamente per consentire la sin
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "Un minuto fa"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuti fa"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ore fa"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "oggi"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ieri"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d giorni fa"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "mese scorso"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d mesi fa"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "anno scorso"
 
-#: template.php:124
+#: template/functions.php:91
 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 3eb3b273357aabdfb02dadf6dd45386a449ea1c7..5180fdb53f5a62e43b3ee866919c34ad4cabf6b9 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 16:50+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"
@@ -172,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 "
@@ -389,72 +396,72 @@ 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\" "
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index fe692028df420545d69a301b43536938cdaaa1da..50fc73cb9c3d75a0d76f3dc3d592122c23530112 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06: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"
@@ -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 a1e7f2deabf424eba51712598951b92819c9c6a1..4289e47fc2dfb6978ed29044d00a69f6ada6ce63 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "12月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "数秒前"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 分前"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分前"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 時間前"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} 時間前"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} 日前"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "一月前"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "一年前"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "年前"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "エラー"
 
@@ -248,123 +248,123 @@ msgstr "共有中"
 msgid "Share"
 msgstr "共有"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "アップロードを許可"
 
-#: 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:618
 msgid "Password protected"
 msgstr "パスワード保護"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "有効期限の未設定エラー"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "有効期限の設定でエラー発生"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "送信中..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "メールを送信しました"
 
@@ -402,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 "ユーザー名"
@@ -467,7 +467,7 @@ msgstr "アクセスが禁止されています"
 msgid "Cloud not found"
 msgstr "見つかりません"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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 ""
@@ -517,65 +518,65 @@ 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 "ログアウト"
 
@@ -609,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/ja_JP/files.po b/l10n/ja_JP/files.po
index 0a0ffe43bd01d0e726c7a4058390d69ba173077f..4872df04800b6f400cd4710f55ef979f5c00c2f0 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: pabook <pabook.32@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -132,43 +132,43 @@ msgstr "削除"
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "中断"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在しています"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} を {new_name} に置換"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "削除を実行"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "ファイルを1つアップロード中"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "ファイルをアップロード中"
 
@@ -208,7 +208,7 @@ msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "サイズ"
 
@@ -216,19 +216,19 @@ msgstr "サイズ"
 msgid "Modified"
 msgstr "変更"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ファイル"
 
@@ -309,10 +309,6 @@ msgstr "ここには何もありません。何かアップロードしてくだ
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "サイズ(MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "共有解除"
@@ -335,19 +331,19 @@ msgstr "ファイルをスキャンしています、しばらくお待ちくだ
 msgid "Current scanning"
 msgstr "スキャン中"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "ディレクトリ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "ディレクトリ"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ファイル"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "ファイル"
 
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 8d5333ecbe981b51f6478ef32aefb1b203d2f8c7..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 b35ce89a8fca6a6c6d4a6e38b1b3d3b5d490435f..bd7180154d88e14192eb76887d3ba17e8cf367c8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+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"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index b5be6ff3a73a4bf153dc7c64643a4f3590796eb8..f9f5fd6827cf555bc5f495b380da0a3442b300e9 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 2b62bba4cc1517b7bd944c70aedd5c18285aa855..685cc2abee389cb87c8abaf54776b70868d77f6d 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/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: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: 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 59328fb3f28f10be2ca25b3d60f59b3b3caeb2db..a9bfe0203ff9ca68ac502fece3b61ae77c443420 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "アプリ"
 msgid "Admin"
 msgstr "管理"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIPダウンロードは無効です。"
@@ -54,15 +64,21 @@ msgstr "ZIPダウンロードは無効です。"
 msgid "Files need to be downloaded one by one."
 msgstr "ファイルは1つずつダウンロードする必要があります。"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ファイルに戻る"
 
-#: files.php:258
+#: 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 "測定できませんでした"
 
@@ -190,58 +206,62 @@ msgstr "WebDAVインタフェースが動作していないと考えられるた
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 分前"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d 分前"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 時間前"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d 時間前"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "今日"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "昨日"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d 日前"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "一月前"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d 分前"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "一年前"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "年前"
 
+#: template.php:296
+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 958d43d9a05bb06b9136205269159f68da7aea06..b539811238b494c4d872d8af91d1f4f1873a544a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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: 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 ""
 
-#: 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 ""
 
-#: 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 サーバには有効なインターネット接続がありません。これは、外部ストレージのマウント、更新の通知、サードパーティ製アプリのインストール、のようないくつかの機能が動作しないことを意味しています。リモートからファイルにアクセスしたり、通知メールを送信したりすることもできません。全ての機能を利用するためには、このサーバのインターネット接続を有効にすることを推奨します。"
-
-#: 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 ""
 
-#: 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 ""
 
-#: 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接続を有効/無効にするために、HTTPS経由でこの ownCloud に接続して下さい。"
+"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 "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\" "
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 174b0a64c3b55568d54d6dd081fff6db7a8fc9da..73e9bc05c1e736be7dc0b5eaacb4b5b30a9994d8 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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: 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"
@@ -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名の生成に利用する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 "デフォルトでは、内部ユーザ名は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 ""
 
 #: 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ユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング(追加)されたLDAPユーザと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は(メタ) データの保存と割り当てにユーザ名を使用します。ユーザを正確に識別して認識するために、個々の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 ""
 
 #: 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..504eff3ee097eeabcee02bc150f594edc5f09a40 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/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-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-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: 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 +25,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 ""
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 5dea5056dfe9a9a1fc7c88a58a8cb9a0340150e9..cb5459f4797bed139587f1c0ba0160d120ef7681 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 74cd7b19fa2f311f323dca8e0667e6305c5480b7..75dfc85d93e5c51cf5c512ef1d1bf16ac20c0173 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr "გადმოწერა"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 9f6a3989f6f1337c04fa4680e7d1bb92d9bf7b2a..ffe0413a6baa5f8c9ce9dcd677db8f4ee3f4d9cb 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
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..5cfcfa245f770f25718246da5676ac542525dd42 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d წუთის წინ"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "დღეს"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d დღის წინ"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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..6408e9c065042a51c23f063576ab4c49d56b516f 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-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: 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..48f5ec175806d1cd0272f01e4db0c08bbffba79d 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-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"
@@ -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 d29c769ee1acc57c8a4cd66795569ef80d452fb8..ff60e8f555dbefd2f80229bc53ac366101b78efb 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "დეკემბერი"
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} წუთის წინ"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} საათის წინ"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} დღის წინ"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} თვის წინ"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -246,123 +246,123 @@ msgstr "გაზიარებული"
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "პაროლით დაცული"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "შეცდომა ვადის გასვლის მითითების დროს"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "გაგზავნა ...."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "იმეილი გაიგზავნა"
 
@@ -400,7 +400,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 "მომხმარებლის სახელი"
@@ -465,7 +465,7 @@ msgstr "წვდომა აკრძალულია"
 msgid "Cloud not found"
 msgstr "ღრუბელი არ არსებობს"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -515,65 +516,65 @@ 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 "გამოსვლა"
 
@@ -607,7 +608,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 ae96713f073ee3c4a2ca8db3409d65b76f106457..480242c4e5ae0460b09b4f828fcbe3a61e3c5bd6 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "წაშლა"
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "შეცვლა"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "სახელის შემოთავაზება"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "უარყოფა"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} შეცვლილია {old_name}–ით"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "მიმდინარეობს წაშლის ოპერაცია"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 ფაილის ატვირთვა"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "ფაილები იტვირთება"
 
@@ -204,7 +204,7 @@ msgstr "დაუშვებელი ფოლდერის სახელ
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "ზომა"
 
@@ -212,19 +212,19 @@ msgstr "ზომა"
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
@@ -305,10 +305,6 @@ msgstr "აქ არაფერი არ არის. ატვირთე
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "გაუზიარებადი"
@@ -331,19 +327,19 @@ msgstr "მიმდინარეობს ფაილების სკა
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index d95f98a23381a9ce0f156ad5758457b2deb28755..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 36ff0ca22ebfb5164afc862b5d44b7c4afa9d45f..58d9060e6621c53cf378fcad4350d576a21ec0d4 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 75ec682b5d59fd53fbe921ec856e728abe165eaa..766e974724ee6a139fd096b472df2cd232344b57 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+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"
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 d2d78a6855bf7d8da65f49680040f546b9c2d7c5..499f821fb1f6cccd5ded920a3474affe0a22d549 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "აპლიკაციები"
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "web services under your control"
 
+#: 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–ი გათიშულია"
@@ -53,15 +63,21 @@ msgstr "ZIP download–ი გათიშულია"
 msgid "Files need to be downloaded one by one."
 msgstr "ფაილები უნდა გადმოიტვირთოს სათითაოდ."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "უკან ფაილებში"
 
-#: files.php:258
+#: 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 "ვერ განისაზღვრა"
 
@@ -189,58 +205,62 @@ msgstr "თქვენი web სერვერი არ არის კო
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d წუთის წინ"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d საათის წინ"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "დღეს"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d  დღის წინ"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d თვის წინ"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "წლის წინ"
 
+#: template.php:296
+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 c355454557adaa449bd9beb82ac7ef432e24daaa..373cecbae3ab7cb9bc98dc3c35c53c447afae452 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 5dc5aa92e6cba67d93618a3f0c3438fc47d6a8bc..9dd4877fc38fa4ebe277064f85fd1d7a5ac32534 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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 (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..fe73859444288a101b3fe764cf9f4ebdf2891a04 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 ed1e91dc9932ec9d5888871ddbc707e7b4f1a0c9..83638dc16fdc44bf38188d058fe2aa71ca870fd4 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-11 02:16+0200\n"
-"PO-Revision-Date: 2013-07-11 00:17+0000\n"
+"POT-Creation-Date: 2013-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-22 05:55+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"
@@ -128,43 +128,43 @@ 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:465
 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
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
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..9b637e4cf9f37ac69179b1a00fd48e04377b80ba 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 bdfa57a83146affc3a1ac93f82ac4b7f74cbbcaf..7335f8e13a412fc3e2e817b3284249f7ac737535 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -142,55 +143,55 @@ msgstr "12ì›”"
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1분 전"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes}분 전"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1시간 전"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours}시간 전"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days}일 전"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months}개월 전"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "ë…„ ì „"
 
@@ -226,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "오류"
 
@@ -247,123 +248,123 @@ msgstr "공유됨"
 msgid "Share"
 msgstr "공유"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "암호로 보호됨"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "전송 중..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "이메일 발송됨"
 
@@ -395,13 +396,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 +417,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"
@@ -466,7 +467,7 @@ msgstr "접근 금지됨"
 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 "ownCloud의 보안을 위하여 PHP 버전을 업데이트하십시오."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,65 +518,65 @@ 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 "로그아웃"
 
@@ -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/ko/files.po b/l10n/ko/files.po
index 3311c70335e6dc56c1d00e6c92b82995a2e38daf..815af6c08d9faeeb03b5cce9e53984fd0dbc20a9 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sungjin Gang <potopro@gmail.com>, 2013
-# Sungjin Gang <potopro@gmail.com>, 2013
+# ujuc Gang <potopro@gmail.com>, 2013
+# ujuc Gang <potopro@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "삭제"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "대기 중"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "바꾸기"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "이름 제안"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "되돌리기"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "삭제 작업중"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "파일 1개 업로드 중"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "파일 업로드중"
 
@@ -206,7 +206,7 @@ msgstr "폴더 이름이 유효하지 않습니다. "
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "크기"
 
@@ -214,19 +214,19 @@ msgstr "크기"
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "파일 {count}개"
 
@@ -307,10 +307,6 @@ msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "공유 해제"
@@ -333,19 +329,19 @@ msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 msgid "Current scanning"
 msgstr "현재 검색"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "파일"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "파일"
 
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 8fe2f1bc3b32efc7c1c9fffffeb8bb68f4cf8e9b..70a042b639c4b00734ca7dde60bd0eecc668ca51 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -3,13 +3,14 @@
 # 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-22 09:20+0000\n"
+"Last-Translator: smallsnail <bjh13579@gmail.com>\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"
@@ -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 ""
@@ -88,7 +89,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 +102,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 +114,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 +144,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 +166,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 3ae5824496ba981bae212eed3b28278fc07ab272..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 d9c91d1dddbc18c72466d39ce35672761e0ba162..10bb8308d044e2e26f5cec0729318f1607612914 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index 01ecfa79de3abb060b75589775d912d80c388f3b..855da19f014dd6aed4c503a9dc2cc6176b105aa3 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
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 6e7f8db3031860ca4bd297b18b5f9616d2d6842e..720609c125c900a62e660eea885bdf86ba39776e 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +42,20 @@ msgstr "앱"
 msgid "Admin"
 msgstr "관리자"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIP 다운로드가 비활성화되었습니다."
@@ -53,15 +64,21 @@ msgstr "ZIP 다운로드가 비활성화되었습니다."
 msgid "Files need to be downloaded one by one."
 msgstr "파일을 개별적으로 다운로드해야 합니다."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "파일로 돌아가기"
 
-#: files.php:258
+#: 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 +109,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 +142,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,15 +185,15 @@ msgstr ""
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL의 사용자 명 혹은 비밀번호가 잘못되었습니다"
 
 #: setup.php:28
 msgid "Set an admin username."
-msgstr ""
+msgstr "관리자 이름 설정"
 
 #: setup.php:31
 msgid "Set an admin password."
-msgstr ""
+msgstr "관리자 비밀번호 설정"
 
 #: setup.php:184
 msgid ""
@@ -189,58 +206,62 @@ msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1분 전"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d분 전"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1시간 전"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d시간 전"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "오늘"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "어제"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d일 전"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "지난 달"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d개월 전"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "ë…„ ì „"
 
+#: template.php:296
+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 896388224711bf9a34c5f75b1ef3d99d52fe5216..d2fb6add9cc661e4520878878d0561f89d48318f 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 18ddb8ec951c0cbe05f91ebca151dc9f1aa079ec..b17eaf1dbee4a3a1d471029699bc91e42b42a542 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 688bf0a4d621f9e6eacb2737a6f24a861df79259..d7eb59f7ed6db0984dc707a9093da9117c3efacb 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "هه‌ڵه"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "ناوی به‌کارهێنه‌ر"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "هیچ نه‌دۆزرایه‌وه‌"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "چوونەدەرەوە"
 
@@ -607,7 +608,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 9adc8ea103243a75ff27c393acaba6af1d0c5019..e8a982abd883b2c42d07905d94d2df7a41e1a69e 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index b6dc0558855367a5c1b7658f75999b849650478c..5cde0384b4d149c3ac8b705ef34ce0fcbc304cf9 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 1e7fb108987d574031698109bfc3826176d45de3..8eb7625f8c64ec9f2b1f8931ee61f79da388ce43 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
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 78cd991e4ddf86149f2f4532a5a83535f79e457d..3c562c92d4cf956a6e2aed129955bf0523078154 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-16 06:02+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "به‌رنامه‌كان"
 msgid "Admin"
 msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 ca8fff2a33c2f2f1ebd0e434ac4599df3022932e..61f66737177e99cb9421f41118f6b2280a4aa305 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 4c592ba7d5d7426d2a0cb9f101b4dd612e5a72cb..2db7dfc5d0ac672e64b391d758cc9fdd78b8dbe6 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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/lb/core.po b/l10n/lb/core.po
index 9874ee4f790468f306fb9b6eff1086bf055a4b97..5a52b6187defb823b733964f1864fccdb85015fb 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -142,55 +142,55 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 Minutt hir"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "virun {minutes} Minutten"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "virun 1 Stonn"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "virun {hours} Stonnen"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "haut"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "gëschter"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "virun {days} Deeg"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "leschte Mount"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "virun {months} Méint"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "Méint hir"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "Lescht Joer"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Feeler"
 
@@ -247,123 +247,123 @@ msgstr "Gedeelt"
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Feeler beim Läsche vum Verfallsdatum"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Gëtt geschéckt..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email geschéckt"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Zougrëff net erlaabt"
 msgid "Cloud not found"
 msgstr "Cloud net fonnt"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +495,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,65 +517,65 @@ 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"
 
@@ -608,7 +609,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 f0da095f33018cf3e272a521a228aaddb4bc10af..245cac9d4af941c1715bed7a4a34ba7f0e948790 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Läschen"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Gréisst"
 
@@ -212,19 +212,19 @@ msgstr "Gréisst"
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr "Hei ass näischt. Lued eppes rop!"
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Net méi deelen"
@@ -331,19 +327,19 @@ msgstr "Fichieren gi gescannt, war weg."
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Datei"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Dateien"
 
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 7f5f1110b9254e618afe51df3bf03ec3417ea5fc..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 2d3aa871ec00f13d08ba4438481ed1f2cf43a3e8..1575fc1547dddd19b7a87f80ddcb86e6e11c5bb7 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: llaera <llaera@outlook.com>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index b0c667f174d328904ac080ad429ca8c0fa24971d..16059ecf97e3d329ca529a6b4bd092aa14a41085 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 cf95d92f4595395c48a9c2cf8addf77993271463..12f02c1dd412b2f969507c883f4dee0b0e7dbb63 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Applikatiounen"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "Web-Servicer ënnert denger Kontroll"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
@@ -54,15 +64,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -190,58 +206,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 Minutt hir"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "vrun 1 Stonn"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "haut"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "gëschter"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "Läschte Mount"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "Läscht Joer"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "Joren hier"
 
+#: template.php:296
+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 c94056e94cbb7a5a2cf209393553187468733975..35610d9727daf1087047b0f318e93ed18b196876 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 beca103ecd1cadc2fa43982c01b5fefa388abfd0..2d45e246d293583315fd03a45b6529fae5a7341a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 4079565e2b284936fbb247b8115ed46dd23e165b..ab6fcfab47caea3f1b5d71f121047dfe681fdff2 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "Gruodis"
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "Prieš 1 minutę"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "Prieš {count} minutes"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "prieš 1 valandą"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "prieš {hours} valandas"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "Å¡iandien"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "Prieš {days}  dienas"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "prieš {months} mėnesių"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "Klaida"
 
@@ -248,123 +248,123 @@ msgstr "Dalinamasi"
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Apsaugota slaptažodžiu"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laikÄ…"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laikÄ…"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Siunčiama..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Laiškas išsiųstas"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Priėjimas draudžiamas"
 msgid "Cloud not found"
 msgstr "Negalima rasti"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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,65 +518,65 @@ 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"
 
@@ -609,7 +610,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 224db714e7217c3cc320d4dc4fcb5e69fad3876d..ce705267f924844879b204ccb8c6cda99ffedc68 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "IÅ¡trinti"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "pasiūlyti pavadinimą"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "ištrinti"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "įkeliamas 1 failas"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "įkeliami failai"
 
@@ -205,7 +205,7 @@ msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownC
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dydis"
 
@@ -213,19 +213,19 @@ msgstr "Dydis"
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} failai"
 
@@ -306,10 +306,6 @@ msgstr "Čia tuščia. Įkelkite ką nors!"
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Nebesidalinti"
@@ -332,19 +328,19 @@ msgstr "Skenuojami failai, prašome palaukti."
 msgid "Current scanning"
 msgstr "Å iuo metu skenuojama"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "failas"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "failai"
 
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 6e2ed19487f2c1561687332ffddd06825e367def..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 e77a732adb86a4ad6e41ac8b6a97578621a39a5b..c6d59f11cd3139a39c7e3dea800ea05de9d6df96 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index bab098187fac813927e8aca3334c20c00688ca47..907804a165094e007a0257fcd817b285bbd18a76 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
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 3c99d90acf69bda46a4cb3aa5a01d1a5a1b1b6b3..c91fa67de3c4c49458b28988ac91e7917397f450 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Programos"
 msgid "Admin"
 msgstr "Administravimas"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
+#: 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."
@@ -54,15 +64,21 @@ msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: files.php:258
+#: 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 ""
 
@@ -190,58 +206,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "Prieš 1 minutę"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "prieš %d minučių"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "prieš 1 valandą"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "prieš %d valandų"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "Å¡iandien"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "vakar"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "prieš %d dienų"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "prieš %d mėnesių"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "praeitais metais"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "prieš metus"
 
+#: template.php:296
+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 87789fa85a557198d65a67702503109f276859b8..60dc7deb39f6c94914a8a149d90aace634baf8ef 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: fizikiukas <fizikiukas@gmail.com>\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: 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"
@@ -170,166 +170,173 @@ msgstr "Slaptažodis turi būti tinkamas"
 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 "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 "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 users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Leisti dalintis"
 
-#: 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 "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 "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 "
@@ -387,72 +394,72 @@ msgstr "Klaidų sekimas"
 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 "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/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index b257319a4250151c28f5a21bf42c59ea2528c6c7..1be664cebcd8217601327d4a034aa522e4ef998a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 66e18c24d98b09d91796f66d06ff7d8e35e2abaf..146ad3890cb2371d63b5d00d641509dc9dff8d58 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "Decembris"
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "pirms 1 minūtes"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "pirms {minutes} minūtēm"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "pirms 1 stundas"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "pirms {hours} stundām"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "Å¡odien"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "pirms {days} dienām"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "pirms {months} mēnešiem"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "mēnešus atpakaļ"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
@@ -225,8 +225,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:631 js/share.js:643
 msgid "Error"
 msgstr "Kļūda"
 
@@ -246,123 +246,123 @@ msgstr "Kopīgs"
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Aizsargāts ar paroli"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "SÅ«ta..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr "Pieeja ir liegta"
 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 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 5a316b75dcc25271f339a89d2d64ff30d4e17745..9452a9c8478976362a0191842dcc4f7dd594507b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Dzēst"
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "veikt dzēšanas darbību"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "Augšupielādē 1 datni"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ow
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Izmērs"
 
@@ -212,19 +212,19 @@ msgstr "Izmērs"
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} datnes"
 
@@ -305,10 +305,6 @@ msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
@@ -331,19 +327,19 @@ msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fails"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index cb771f70aa1141751f846c493ff2319fe068a2f0..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 51e14cf6687fdb9bc672ebbaf1987ab44c1628f3..260a895ad749e81018a5615968e1b0d8ef252f97 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 997a4b3fd9a9a2ecd98e7138a0374a9aa9d536b7..881f546bf4c8169c417a53b12cca1332bedfc363 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
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 6044beaba650af2bc5f519c0cacad0ed4afdd6a2..bf2fd831db6badc24cc10c4fae57967b53741935 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Lietotnes"
 msgid "Admin"
 msgstr "Administratori"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "tīmekļa servisi tavā varā"
 
+#: 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."
@@ -53,15 +63,21 @@ msgstr "ZIP lejupielādēšana ir izslēgta."
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielādēt tikai katru atsevišķi."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Atpakaļ pie datnēm"
 
-#: files.php:258
+#: 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"
 
@@ -189,58 +205,62 @@ msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datn
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "pirms 1 minūtes"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "pirms %d minūtēm"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "pirms 1 stundas"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "pirms %d stundām"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "Å¡odien"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "vakar"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "pirms %d dienām"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "pirms %d mēnešiem"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
+#: template.php:296
+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 a060577967ad4aff9387c2b924d51146c515412b..46c574e7af6fbdcad52185ed6c335f4c5e1a9e09 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 30bd72afc73676f3535a324bf1db03130fef0376..92dd810cdda3b46d461016095bee878d965315ed 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 bf38be93751f3d3a3e26ac5d449e54146fa7f4c5..bab8937ac23eae0d4eda690c41bf4119e5e7b2fd 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "Декември"
 msgid "Settings"
 msgstr "Подесувања"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "пред 1 минута"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "пред {minutes} минути"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "пред 1 час"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "пред {hours} часови"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "пред {days} денови"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "пред {months} месеци"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "пред месеци"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Грешка"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Сподели"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Заштитено со лозинка"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Грешка при тргање на рокот на траење"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Грешка при поставување на рок на траење"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Праќање..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Е-порака пратена"
 
@@ -400,7 +400,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 "Корисничко име"
@@ -465,7 +465,7 @@ msgstr "Забранет пристап"
 msgid "Cloud not found"
 msgstr "Облакот не е најден"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "Одјава"
 
@@ -607,7 +608,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 aefc904b4f430b45c57261ee57e5b2fea4b1a667..15ac727406a5acf2d2464cf7506e398def5a7878 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Избриши"
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "предложи име"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменета {new_name} со {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 датотека се подига"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Големина"
 
@@ -212,19 +212,19 @@ msgstr "Големина"
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} датотеки"
 
@@ -305,10 +305,6 @@ msgstr "Тука нема ништо. Снимете нешто!"
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Не споделувај"
@@ -331,19 +327,19 @@ msgstr "Се скенираат датотеки, ве молам почекај
 msgid "Current scanning"
 msgstr "Моментално скенирам"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "датотека"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "датотеки"
 
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index f7ae77d94262a6ab85ec4185cee75bf5ffe5835c..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 b9a64540c00c7e52be7d7ea1d82d9a9b9d55cc91..726a5e18b7f6b6ce290de88b9d07776251108347 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 7843be64c1d9116f401fde790095883ecd789223..1337bc1892f3c540c6df75f4960dbb278ca4a664 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 d327bb9be14aa5dcf6957fea6fba3ec3dab36f33..836a3490761fb9829c43276101f579f31fa84cbe 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Аппликации"
 msgid "Admin"
 msgstr "Админ"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "Преземање во ZIP е исклучено"
@@ -53,15 +63,21 @@ msgstr "Преземање во ZIP е исклучено"
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеките треба да се симнат една по една."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Назад кон датотеки"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "пред 1 минута"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "пред %d минути"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "пред 1 час"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "пред %d часови"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "денеска"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "вчера"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "пред %d денови"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "минатиот месец"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "пред %d месеци"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "минатата година"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "пред години"
 
+#: template.php:296
+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 a5a52e25805acf2562f1fb415e5be650d4ad1502..0018282afe60791354e113029cb1455e5d612f12 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 f9ed93c5c1a22b8640da33bfd3545dbbb1ce6014..a3e8985fa6e9a95c8ef0faf5354b7f3970cfd5f8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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..1beda2b8444bb1d748ea143ae9afc37654b104ad 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 d4f03fb1ffef77d3b3d620b69b483d79b1d0f1cb..056f4c8f4b5e38f3a2f9f669147c104c8a514376 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-11 02:16+0200\n"
-"PO-Revision-Date: 2013-07-11 00:18+0000\n"
+"POT-Creation-Date: 2013-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-22 05:55+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"
@@ -128,43 +128,43 @@ 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:465
 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
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
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..8590f74b6742294a647f0a4157fde0a362e14cc6 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 84b97b83658d22ca7fc3bbc5eadfddb7b0d92767..74c4ed00318b2e4bb1caaaf88c94ba65ab43aef6 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "Disember"
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Ralat"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr "Larangan akses"
 msgid "Cloud not found"
 msgstr "Awan tidak dijumpai"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 42e37f108e54b5a341a4cc0bd98a1eeaf37bb4e0..30702361ddd8bc21ed51fe5c73e0c99a92fdb0e2 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Padam"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Saiz"
 
@@ -212,19 +212,19 @@ msgstr "Saiz"
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr "Fail sedang diimbas, harap bersabar."
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fail"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fail"
 
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index e770e88ca152fe70865e0107d97779cc1b4056ef..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 5252b40240dc410be33951cb0d44fce7c7713d2c..cbc98cfdb5e1b92ad164a9f7c1181690995090ce 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index a71ed0cb72eaa4b8a154acaf461dfb608372311b..b1db65e4c26857f15848868aead70c3dfc9222b9 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 00d2ad1a426b22ba40dcf9bf102de11aaa3d7063..d0deb26d3fa177b41db37b282a6449b5818fcfbd 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Aplikasi"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 5cdaa3c84c7b9d80c9e871e956d59659c8559210..ef2595222e444f017776a172a6c8a3a281408444 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 e1902a86ed2c2f0aef78c26772f02ab60bfb3748..290acb297ba019f48313bc8f532c0ef6a783da1b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 fdc5abda0726cdde7004e01aa4dd7db73980b556..1d1bd2e71485e6d05ee4918ea286aa3b722b96af 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "ဒီဇင်ဘာ"
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "၁ မိနစ်အရင်က"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "၁ နာရီ အရင်က"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "သုံးစွဲသူအမည်"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "မတွေ့ရှိမိပါ"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 677a0e3e085fd15add5955a061d47aa6abc88ebc..c7aec58aa31bd705457945aaeb2eca091af6840b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 00e3a1124ba8cfa88518d913a034a81bef389dff..7cf20920a72606629029c60bc849bcc299df7949 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
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 8a4a39daf890dc0d29d7994f89cdf173d5517fb0..5b05b4a9110471f39781331bf315ff467a7515a4 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "အက်ဒမင်"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
@@ -53,15 +63,21 @@ msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည
 msgid "Files need to be downloaded one by one."
 msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ဖိုင်သို့ပြန်သွားမည်"
 
-#: files.php:258
+#: 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 "မဆုံးဖြတ်နိုင်ပါ။"
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "၁ မိနစ်အရင်က"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d မိနစ်အရင်က"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "၁ နာရီ အရင်က"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d နာရီအရင်က"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "ယနေ့"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d ရက် အရင်က"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d လအရင်က"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
+#: template.php:296
+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..4eda2c15beb5cb7a19f160637f576d6ed8040caa 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-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: 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..4cb821a8db848faedac25e5c2502c0016972bca6 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-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"
@@ -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 1d15e8b1c77fad54fb0734e244b430bc54d9342b..22ee3db46c48bd310204c927ac59e8093d0f4acc 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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
@@ -141,55 +142,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "forrige år"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Feil"
 
@@ -240,129 +241,129 @@ 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:671
 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:618
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-post sendt"
 
@@ -400,7 +401,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"
@@ -465,7 +466,7 @@ msgstr "Tilgang nektet"
 msgid "Cloud not found"
 msgstr "Sky ikke funnet"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,7 +475,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 +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,65 +517,65 @@ 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"
 
@@ -607,7 +609,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 +627,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 88e99ce2be46f36848bdf5b44bef9693b0468a97..a3d0e3fdf39413b33980d8f523cc522c7adf0fc3 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Stein-Aksel Basma <stabasm@hotmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Omdøp"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "utfør sletting"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "filer lastes opp"
 
@@ -206,7 +206,7 @@ msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
@@ -214,19 +214,19 @@ msgstr "Størrelse"
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -307,10 +307,6 @@ msgstr "Ingenting her. Last opp noe!"
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Størrelse (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Avslutt deling"
@@ -333,19 +329,19 @@ msgstr "Skanner etter filer, vennligst vent."
 msgid "Current scanning"
 msgstr "Pågående skanning"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "katalog"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "kataloger"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fil"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index dd1309cae2ed3ec28ce184a0e108e266193d3af0..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 7be544650e2c28dbe2e354dafe4e049ba4f5be4b..4e20072c1912fb6d64acb09df084eb504bed1d5d 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Stein-Aksel Basma <stabasm@hotmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 61610e1b69babbb7ddd72164dcb7f61d66a563eb..ab52f682c28f8934f9bc2d4fa456066155e31a2f 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+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"
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 49359dd54c1daf08b962f8c67b9439f2fb4dd730..771095599f9e812235fad31fa43320ee9aeb2e35 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Apper"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "web tjenester du kontrollerer"
 
+#: 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"
@@ -53,15 +63,21 @@ msgstr "ZIP-nedlasting av avslått"
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutter siden"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d timer siden"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "i går"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d dager siden"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "forrige måned"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d måneder siden"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "forrige år"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "Ã¥r siden"
 
+#: template.php:296
+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 e07bd991fdb46ad533f5133ae9c90e9faf33d347..feb3576e2d9e333309736c2e41bec8f3422cd1ea 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Stein-Aksel Basma <stabasm@hotmail.com>\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: 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"
@@ -171,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 "
@@ -388,72 +395,72 @@ 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\" "
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index be36462550e5982965e14a4f085939000e3319a0..ed9414cb2ec6b15ee8792ce5b04367ba40c64549 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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..34bd08ae62af24bdf085c1c3b9d4cfc027102fc1 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 fbce462cfdc762c6c5a5afe5f219bca0048d4161..26e7154708e235c0b378df75e135d9c5554b43ae 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-11 02:16+0200\n"
-"PO-Revision-Date: 2013-07-11 00:18+0000\n"
+"POT-Creation-Date: 2013-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-22 05:55+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"
@@ -128,43 +128,43 @@ 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:465
 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
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
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..5445c8e816c572a9e060527e30a73e69ea87adac 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 46351da7a417b2e3552dbd24c651d106d9dd3f69..11f2fa2b7af4074bdfaf8b7e5943487b0af9f5f1 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "december"
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuten geleden"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} uren geleden"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dagen geleden"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} maanden geleden"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "Fout"
 
@@ -248,123 +248,123 @@ msgstr "Gedeeld"
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Toegang verboden"
 msgid "Cloud not found"
 msgstr "Cloud niet gevonden"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,65 +518,65 @@ 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 ""
 
-#: 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"
 
@@ -609,7 +610,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 99d32b963073649482f9c7a5aad3007f30620f70..9ccf2501fec6206b82015fbd000b2c0a33bd2c78 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Verwijder"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "uitvoeren verwijderactie"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 bestand wordt ge-upload"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "bestanden aan het uploaden"
 
@@ -205,7 +205,7 @@ msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Grootte"
 
@@ -213,26 +213,26 @@ msgstr "Grootte"
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} bestanden"
 
 #: 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"
@@ -306,10 +306,6 @@ msgstr "Er bevindt zich hier niets. Upload een bestand!"
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Stop met delen"
@@ -332,19 +328,19 @@ msgstr "Bestanden worden gescand, even wachten."
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "directory"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "directories"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "bestand"
 
-#: templates/part.list.php:89
+#: 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..e0fd1bf827b5b4bdfea13ea0460ab89cd959d726 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-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"
@@ -60,18 +61,18 @@ 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 ""
+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."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 7c559a1b01c8e88c6eda0363afc9ee1ba80ca08c..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 9c6e71f8119faa972d84336ab12e91dc433a3582..694d58f3491db6a00494b06000143cfcf5d05aa2 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -3,13 +3,14 @@
 # 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: André Koot <meneer@tken.net>\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 +20,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"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 233e63b47f73ecc2be07b4aae82a3d0f5fb3aff4..55f3e2dec78ecbfafd0894aaf6fba746b145b6ee 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
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 a5f5054555a25f920d561d353dd084e02b1d16e8..5e7af88a23aaba7ed1ec7c33f5f7d0b17dfd97f2 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: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"
@@ -42,10 +43,20 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Beheerder"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +65,21 @@ msgstr "ZIP download is uitgeschakeld."
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +207,62 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuten geleden"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d uren geleden"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "vandaag"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "gisteren"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d dagen geleden"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "vorige maand"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d maanden geleden"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "vorig jaar"
 
-#: template.php:124
+#: template/functions.php:91
 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 a433bef40344ebac71386dfdcb585c229bf6a4f2..a2ed8c51e68d57942a1525b4383563e53b4ff27e 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: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"
@@ -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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 07795340d6ba56abda346137cb5479a68ef43118..7c9429c3540f4750b87f103636bbac00b1dd14fa 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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 15:00+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,9 +90,9 @@ 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."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -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 acb70a63f9cb4367d15f09b531b19ce2fc6c0aff..0fcbde93026c3cecc6567a75baec731503b955e5 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minutt sidan"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutt sidan"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 time sidan"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} timar sidan"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dagar sidan"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} månadar sidan"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "månadar sidan"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Feil"
 
@@ -248,123 +248,123 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-post sendt"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Tilgang forbudt"
 msgid "Cloud not found"
 msgstr "Fann ikkje skyen"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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,65 +518,65 @@ 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"
 
@@ -609,7 +610,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 d719a5bd7fbb1bab2757b15d2a601d6854cee124..5c8ea2aa317cc54d18569bb98ecee655927d2b96 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "byt ut"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "føreslå namn"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "utfør sletting"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fil lastar opp"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "filer lastar opp"
 
@@ -206,7 +206,7 @@ msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Storleik"
 
@@ -214,19 +214,19 @@ msgstr "Storleik"
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -307,10 +307,6 @@ msgstr "Ingenting her. Last noko opp!"
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Udel"
@@ -333,19 +329,19 @@ msgstr "Skannar filer, ver venleg og vent."
 msgid "Current scanning"
 msgstr "Køyrande skanning"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 3471add2cda99e2f4adc44aa7457a2653974ff90..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 0a5422156bbc13a3ff6d74c0a4f90380810f7ffd..636d57bd68997ffe422f1da2a86e852034ef173c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 256acba665f1281bc123ce8e716360404068f735..6a0827643e66582db7314f5f3ffe6a05386a89ad 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
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 75bd3f8d3c75bfc474fc2b26cc5172c1c03f9156..3ca8a975f7a5ac5c648d81d21996d663d14d69b5 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Program"
 msgid "Admin"
 msgstr "Administrer"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
@@ -54,15 +64,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -190,58 +206,62 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minutt sidan"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 time sidan"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "i går"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "førre månad"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "i fjor"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "Ã¥r sidan"
 
+#: template.php:296
+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 99d9c140732dcc6b3f304ea118f38ca69e3f1edd..aeaadb95a3c8631344f6089ec4a21b50b25a5410 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 8de011ddc6489df000d50d0c1fd474f0b422eae9..888152a0e12ec93cff85dc277f1932a0a9e4ac17 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 8d99cd1759d9623fb61818d396c421af1f73d7b0..f7f6fb8762a5d5f39518665b4858bf3719dab39c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Error"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr "Acces enebit"
 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 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 d631723fec749878be752d2d73c03f870d3b2300..7963637bb495bb89cbdddbe8b236643f02297315 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Escafa"
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "remplaça"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 fichièr al amontcargar"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "fichièrs al amontcargar"
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Talha"
 
@@ -212,19 +212,19 @@ msgstr "Talha"
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr "Pas res dedins. Amontcarga qualquaren"
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Pas partejador"
@@ -331,19 +327,19 @@ msgstr "Los fiichièrs son a èsser explorats, "
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fichièr"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fichièrs"
 
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index 3092ccb23a945b22a03371103c93c4df458e99ba..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 4e7cfb1f4b41cdeeeed30f11793c0a6cd4b1d54c..aff7086e917c5b6da961da390c55f5f8e264cba7 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index d1a4d8700bdc8070fa0dcc76e73579286d3fa6f9..e426248ab713a2ebe207165c448bd4cc981ae672 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 07236bf267108ca31b58ab148bf4fcca9a93b6ed..9fd1bfbc3437aaea617023247d8449c623729406 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-16 06:02+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "Services web jos ton contraròtle"
 
+#: 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."
@@ -53,15 +63,21 @@ msgstr "Avalcargar los ZIP es inactiu."
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichièrs devan èsser avalcargats un per un."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Torna cap als fichièrs"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutas a"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "uèi"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ièr"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d jorns a"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "mes passat"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "an passat"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "ans a"
 
+#: template.php:296
+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 73a128d7fbeed2dfdde55e6ce458f2b27596c16c..ad508f906833b3b8105261ecb44c641b88574691 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 11f7a91f8937611c392600cfb3a10e6d6c292ba7..94e56e4b2a659dfd4d829d11e467d73da955947b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 ed92a73689df2436cb2ff2218d2dd2cb45855c71..6ddef20473c6ffc95fe8d0f5da2381009a557910 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "Grudzień"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minutÄ™ temu"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 godzinÄ™ temu"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} miesięcy temu"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "lat temu"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -248,123 +248,123 @@ msgstr "Udostępniono"
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Wysyłanie..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-mail wysłany"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Dostęp zabroniony"
 msgid "Cloud not found"
 msgstr "Nie odnaleziono chmury"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,65 +518,65 @@ 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 ""
 
-#: 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"
 
@@ -609,7 +610,7 @@ 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 "
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 11fb080586ae1fac2e129bf20ab7a75a2a62c4c3..3d1c0da649d28e588c91f7d4a09e79afb738aab2 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -130,43 +130,43 @@ msgstr "Usuń"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zastÄ…p"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piono {new_name} przez {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "wykonaj operację usunięcia"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 plik wczytywany"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "pliki wczytane"
 
@@ -206,7 +206,7 @@ msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zare
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -214,19 +214,19 @@ msgstr "Rozmiar"
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "Ilość folderów: {count}"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "Ilość plików: {count}"
 
@@ -307,10 +307,6 @@ msgstr "Pusto. Wyślij coś!"
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
@@ -333,19 +329,19 @@ msgstr "Skanowanie plików, proszę czekać."
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "Katalog"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "Katalogi"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "plik"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "pliki"
 
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index 7e4fe365b81f937f0fb803f56e0ff37d0941e6a9..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 06cd70c042731b59a12eabf4166cec88dd8cec42..fd067dfc86da4ba3185e8152df892a75c1c22b5b 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 3a4f3c3f2d3e86d06f796926bfee6a7ea7b4b7ac..209782e2720da6beee5e42cedcd8dd2d5705411c 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index 897cae06adf82179d4d7a705e7c7ab4175eeac3d..6a4a6de114e0d86cacdc54c31c987365ef12858f 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nie podano ścieżki"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Wersje"
+#: 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 "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 325fe512848da16e84b94558b205fda2911298f4..69554bc77cf01fa0b1af82463eab2beb9fe2904c 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Aplikacje"
 msgid "Admin"
 msgstr "Administrator"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "Kontrolowane serwisy"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyłączone."
@@ -54,15 +64,21 @@ msgstr "Pobieranie ZIP jest wyłączone."
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszą zostać pobrane pojedynczo."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Wróć do plików"
 
-#: files.php:258
+#: 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 ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nie może zostać znaleziony"
 
@@ -190,58 +206,62 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minutÄ™ temu"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minut temu"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 godzinÄ™ temu"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d godzin temu"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "dziÅ›"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d dni temu"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d miesiecy temu"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "lat temu"
 
+#: template.php:296
+msgid "Caused by:"
+msgstr ""
+
 #: 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 4e275e0f5c11176f023c2268cf932dc8efceb56f..1dac979b4baa40e7e8b0bcf44c40b7ba7b6966c5 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\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 ""
 
-#: 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 ""
+
 #: 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 ""
 
-#: 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 6f1694e4d8f8456a9d271fc7e33c1dce50b90af1..65f5dbf639913d9cc40ff7dbedfade443ac51c74 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: orcio6 <orcio6@o2.pl>\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: 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..ced5b2d9f81098d8c2dab4abfffb5af2674e6fed 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/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-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 09:50+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "Uwierzytelnienie 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 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 ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index bf429e33e433880e75f21cc2da162d27bb5ac591..72f480100da69a04380ec5d17256dba1c4e11309 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+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-25 12:10+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"
@@ -143,55 +143,55 @@ msgstr "dezembro"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minuto atrás"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 hora atrás"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrás"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Erro"
 
@@ -248,123 +248,123 @@ msgstr "Compartilhados"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-mail enviado"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Acesso proibido"
 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 +496,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,65 +518,65 @@ 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"
 
@@ -609,7 +610,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 cb96efb64a1297f0cb73a2fc6c1a862358ad8d66..6571b85a956c9597d0581321c76a36d82fac0b34 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -131,43 +131,43 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Substituído {old_name} por {new_name} "
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "realizar operação de exclusão"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "enviando 1 arquivo"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "enviando arquivos"
 
@@ -207,7 +207,7 @@ msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud"
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
@@ -215,19 +215,19 @@ msgstr "Tamanho"
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} arquivos"
 
@@ -308,10 +308,6 @@ msgstr "Nada aqui.Carrege alguma coisa!"
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Tamanho (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Descompartilhar"
@@ -334,19 +330,19 @@ msgstr "Arquivos sendo escaneados, por favor aguarde."
 msgid "Current scanning"
 msgstr "Scanning atual"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "diretório"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "diretórios"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "arquivo"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "arquivos"
 
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index ba4b1deea10c09176ac72e2d1934f340b15f3b4d..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 154dc2b04f494491ea62f7bad02a1de2dea2f98f..e4acbc625bbd2bce0b5c5cbe43ded496acd8c498 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 9914284011a0a03755fbe32c355d9da4152964a3..3b805ac63fe2d5236321afc324a177eee65c5d2e 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
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 eee42dedd6ac836784c5276386366e0c26ac3fbb..5d2ae3453f1458ee7da64b8e0537bd6d1c5d8a42 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-24 10: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,10 +42,20 @@ msgstr "Aplicações"
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +64,21 @@ msgstr "Download ZIP está desligado."
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +206,62 @@ msgstr "Seu servidor web não está configurado corretamente para permitir sincr
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minuto atrás"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutos atrás"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 hora atrás"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d horas atrás"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hoje"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ontem"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d dias atrás"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "último mês"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d meses atrás"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "último ano"
 
-#: template.php:124
+#: template/functions.php:91
 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 51fd18a894e449bd7c4338608dd45edc23904862..08e1098056dca78cf7cf6005ccc15daa4b8e363c 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: bjamalaro <bjamalaro@yahoo.com.br>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
 "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,72 +395,72 @@ 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\" "
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index fddab3d10e9c63d221d2c08768ebb71f327cdcbe..aeab73f5382da7fbabbca63d22bdbe19fe992549 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 12:10+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 032128f4e46dde9424d4e0e72c401d0cf5930b48..6210982a92502aeedbd1c0bee63862bd01b20dd7 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 11: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"
@@ -145,55 +145,55 @@ msgstr "Dezembro"
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "Há 1 minuto"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Há 1 horas"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "Há {hours} horas atrás"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "Há {months} meses atrás"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -229,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:631 js/share.js:643
 msgid "Error"
 msgstr "Erro"
 
@@ -250,123 +250,123 @@ msgstr "Partilhado"
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "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:618
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-mail enviado"
 
@@ -404,7 +404,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"
@@ -415,7 +415,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 "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"
@@ -469,7 +469,7 @@ msgstr "Acesso interdito"
 msgid "Cloud not found"
 msgstr "Cloud nao encontrada"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -498,8 +498,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 ""
@@ -519,65 +520,65 @@ 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"
 
@@ -611,7 +612,7 @@ 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 "
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 434bb213cdd1b594a70b922e2e3a3cafee121c4d..480cb0feb4b70ec9063169e9cb844c8a98e8ba8d 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: FernandoMASilva\n"
+"POT-Creation-Date: 2013-07-29 01:55-0400\n"
+"PO-Revision-Date: 2013-07-28 10:30+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"
@@ -130,43 +130,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Executar a tarefa de apagar"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "A enviar 1 ficheiro"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "A enviar os ficheiros"
 
@@ -206,7 +206,7 @@ msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
@@ -214,19 +214,19 @@ msgstr "Tamanho"
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
@@ -307,10 +307,6 @@ msgstr "Vazio. Envie alguma coisa!"
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Tamanho (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de partilhar"
@@ -333,19 +329,19 @@ msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 msgid "Current scanning"
 msgstr "Análise actual"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "diretório"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "diretórios"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ficheiro"
 
-#: templates/part.list.php:89
+#: 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..b9a5089858ad4cb7098269bdca471b244864fa7d 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-22 15:30+0000\n"
+"Last-Translator: moura232 <moura232@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"
@@ -61,7 +62,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 "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."
@@ -72,7 +73,7 @@ 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 ""
+msgstr "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está ativada e corretamente configurada. Por agora, a encripitação está desativado."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -90,7 +91,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"
@@ -157,7 +158,7 @@ msgstr ""
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "ativar recuperação do password:"
 
 #: templates/settings-personal.php:47
 msgid ""
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index ad563a800d3aa7489d70345596206d59e2d9a636..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 0f835b3d61e57010f60780225623bd0f179d14c3..efa7e06de16594384a26f46d2cb9e69c6240bd4f 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: moliveira <manuel.oliveira@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 +20,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"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 9b6468b0bb40ebc8a1562f6b2dd11ba93572a62d..7cd7ebcea2726efbc28e1be67e0e9ab6450d552f 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 07264486f6a61883791e758a7bd875c89dba70a1..d994d16d84ed01dcd1f6ee1735145fdfbe8bc871 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/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: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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"
-
-#: history.php:49
-msgid "failure"
-msgstr "Falha"
-
-#: 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:7
+msgid "Versions"
+msgstr "Versões"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Não existem versões mais antigas"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nenhum caminho especificado"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versões"
+#: 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 "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 6e4aa5fd61c7cf9723c445785d6aa30d44925cfc..9cba8216b23cd7498704f607bf7603b77274d0dd 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-25 13: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"
@@ -42,10 +42,20 @@ msgstr "Aplicações"
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +64,21 @@ msgstr "Descarregamento em ZIP está desligado."
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +206,62 @@ msgstr "O seu servidor web não está configurado correctamente para autorizar s
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "Há 1 minuto"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "há %d minutos"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Há 1 horas"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Há %d horas"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hoje"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ontem"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "há %d dias"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "ultímo mês"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Há %d meses atrás"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "ano passado"
 
-#: template.php:124
+#: template/functions.php:91
 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 368813fee2f9d9e30f29438024eec0c4c3f96f5c..341c7e882f2ebcfb70a1926e7291f9d0373071d9 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 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"
@@ -173,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 "
@@ -390,72 +397,72 @@ 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\" "
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index ac061a994bbc32b94cf7a2d23566c92bd6acfc88..ed8da9741bdc3c36b44a2509a63e54344e511b9c 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: Bruno Martins <bruno@bmartins.eu>\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: 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"
@@ -91,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 ""
@@ -224,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"
@@ -244,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."
@@ -270,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"
@@ -294,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"
@@ -355,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 "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres nao necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituidos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para novos utilizadores 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 +374,14 @@ 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 "Por defeito, o ownCloud deteta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados)."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -392,18 +393,17 @@ 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."
-msgstr "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa 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 ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index bee54e46dab1e05d77669bea1856f26415b5fbe2..7a6d139b2edd1782b6bcd51b073e7773069ac850 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/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: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "Autenticação 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 "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 ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 103248d1ead913d9df81e502692c80e887e67120..135a71c57a1f9ece52aa0d5681b24cb53ae5af9c 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -144,55 +144,55 @@ msgstr "Decembrie"
 msgid "Settings"
 msgstr "Setări"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minut în urmă"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minute in urma"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} ore în urmă"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} zile in urma"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} luni în urmă"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -228,8 +228,8 @@ msgstr "Tipul obiectului nu a fost 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:631 js/share.js:643
 msgid "Error"
 msgstr "Eroare"
 
@@ -249,123 +249,123 @@ msgstr "Partajat"
 msgid "Share"
 msgstr "Partajează"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
@@ -403,7 +403,7 @@ msgstr "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corec
 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"
 
-#: 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"
@@ -468,7 +468,7 @@ msgstr "Acces interzis"
 msgid "Cloud not found"
 msgstr "Nu s-a găsit"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -497,8 +497,9 @@ 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)"
 
 #: 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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -518,65 +519,65 @@ msgid ""
 "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ă."
 
-#: 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 ""
 
-#: 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"
 
@@ -610,7 +611,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 50bebf9d078dfc70ebd524ef104441b362781308..29b550b041b2a3ecbf22a638e32a4284a72cd0a9 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -131,43 +131,43 @@ msgstr "Șterge"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "înlocuire"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugerează nume"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "efectueaza operatiunea de stergere"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "un fișier se încarcă"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "fișiere se încarcă"
 
@@ -207,7 +207,7 @@ msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -215,19 +215,19 @@ msgstr "Dimensiune"
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} fisiere"
 
@@ -308,10 +308,6 @@ msgstr "Nimic aici. Încarcă ceva!"
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Anulare partajare"
@@ -334,19 +330,19 @@ msgstr "Fișierele sunt scanate, te rog așteptă."
 msgid "Current scanning"
 msgstr "ÃŽn curs de scanare"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "catalog"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "cataloage"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fișier"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fișiere"
 
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 5af30fa7f3cf69e7fb19a5d09651a07a4a964f75..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 9f185dd28fcd75cfcbfdbebcbe5478d989f05dfa..16ec0309aee1ccef032807c2d60538f97efa5a95 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: sergiu_sechel <sergiu.sechel@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index f8343d0c8bafd1456b7aaf55991d4dbd4de3aa86..22971b884bfe6f447223160f56edade77fdf9cf4 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
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 39ebd8a985719c7a7f1429373cb6c45abc9d5ecc..9dcc447b2b211bd8e835d050495be5fb38f7a63c 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Aplicații"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
+#: 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ă."
@@ -53,15 +63,21 @@ msgstr "Descărcarea ZIP este dezactivată."
 msgid "Files need to be downloaded one by one."
 msgstr "Fișierele trebuie descărcate unul câte unul."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Înapoi la fișiere"
 
-#: files.php:258
+#: 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"
 
@@ -189,58 +205,62 @@ msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sin
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minut în urmă"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minute în urmă"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ore in urma"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "astăzi"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ieri"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d zile în urmă"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "ultima lună"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d luni in urma"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "ultimul an"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "ani în urmă"
 
+#: template.php:296
+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 da06741307dea79940f484a685b1a36f10ea886a..eeb631665ce9fd12ff858592a42bbe38d66a033f 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 689e62678a83c9bd7ca7e046c4908809df1fe7b3..a8544e419c22f59f24f3f08b543b377bbc139235 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 8e00c64345d9eb637e75688e902b4fc8faf0433f..4ac59f4bd01cb4e61f1b431acf49692f9e24a969 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.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-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
-"Last-Translator: Victor Bravo <>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -147,55 +147,55 @@ msgstr "Декабрь"
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} минут назад"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "час назад"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} часов назад"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} дней назад"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} месяцев назад"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "несколько месяцев назад"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "несколько лет назад"
 
@@ -231,8 +231,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:631 js/share.js:643
 msgid "Error"
 msgstr "Ошибка"
 
@@ -252,123 +252,123 @@ msgstr "Общие"
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Защищено паролем"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене срока доступа"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке срока доступа"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Отправляется ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Письмо отправлено"
 
@@ -406,7 +406,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 "Имя пользователя"
@@ -471,7 +471,7 @@ msgstr "Доступ запрещён"
 msgid "Cloud not found"
 msgstr "Облако не найдено"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -500,8 +500,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 ""
@@ -521,65 +522,65 @@ 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 "Выйти"
 
@@ -613,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/ru/files.po b/l10n/ru/files.po
index 72933985dfd23d715c7872ecb4c487bc7f70c403..593ec765477c165a23ea228bf596731b69e72187 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: hackproof <hackproof.ai@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -132,43 +132,43 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "предложить название"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "выполнить операцию удаления"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "загружается 1 файл"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "файлы загружаются"
 
@@ -208,7 +208,7 @@ msgstr "Неправильное имя каталога. Имя 'Shared' зар
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
@@ -216,19 +216,19 @@ msgstr "Размер"
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} файлов"
 
@@ -309,10 +309,6 @@ msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "Размер (Мб)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Закрыть общий доступ"
@@ -335,19 +331,19 @@ msgstr "Подождите, файлы сканируются."
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "директория"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "директории"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "файл"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "файлы"
 
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 01d2dac194e594f34c1c4439f1d9da207bd7e4bb..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 a5a2fca56c42f721d4ca21b0871c5976352f84eb..c55ea5d2491cc91b6439ebcce0097d0292606a8b 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Victor Bravo <>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 05bd3f11bb07a458300dc3e9bca2a90323d69305..3c61e740b1222609944f265fa7fce636049b6573 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 78d3f7898b96c174eacfe2b47376cf7eabc9389b..af0b3d11d9ab7de9630a0580a5a06710d609686e 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/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: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: 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 2e40b5ee0da5a9f16262559cb56e5d3bc95e88ec..36029f07eece27ade03642fa3030165cd38b68f4 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Приложения"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIP-скачивание отключено."
@@ -54,15 +64,21 @@ msgstr "ZIP-скачивание отключено."
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: files.php:258
+#: 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 "Невозможно установить"
 
@@ -190,58 +206,62 @@ msgstr "Ваш веб сервер до сих пор не настроен пр
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d минут назад"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "час назад"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d часов назад"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "сегодня"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "вчера"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d дней назад"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d месяцев назад"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "в прошлом году"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "несколько лет назад"
 
+#: template.php:296
+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 b559856f8068cf43a97a5d6672e158ab018e8c76..26832676f12115711bca788ea2e8589991b9eb3c 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: hackproof <hackproof.ai@gmail.com>\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: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -174,166 +174,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 "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 не имеет рабочего интернет-соединения. Это значит, что некоторые возможности отключены, например: подключение внешних носителей, уведомления об обновлениях, установка сторонних приложений."
-
-#: 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 ""
 
-#: 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,72 +398,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 "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\" "
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 0689c0a87efe8f8293aa923a63e2b30e687af442..cefc3671a27eb82551ed7642bd86dad70b6671fd 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: alfsoft <alfsoft@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: 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 +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 ""
 
 #: templates/settings.php:12
 msgid ""
@@ -223,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"
@@ -243,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 "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
+"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 "Поле отображаемого имени пользователя"
 
 #: 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 +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 "Атрибут 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 +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. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, 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 +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 автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -391,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. При создании имя пользователя назначается идентификатору 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..e9aa52bf9b041414af6a53c0b8796c447331ff78 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/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-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-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: 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 +27,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 ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 9ab7db9deb6e7e78ff38c960befa2cc2ef7503c4..f0c602379920704fdb35e5ef4b28cddd4133967b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "දෙසැම්බර්"
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 මිනිත්තුවකට පෙර"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "දෝෂයක්"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "පරිශීලක නම"
@@ -465,7 +465,7 @@ msgstr "ඇතුල් වීම තහනම්"
 msgid "Cloud not found"
 msgstr "සොයා ගත නොහැක"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "නික්මීම"
 
@@ -607,7 +608,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 af12eeedd31b88eb4ddc573a2f2e7113edc61dab..acc9d595006d6d4dcba497ca726675b159c79ea6 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "මකා දමන්න"
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ප්‍රතිස්ථාපනය කරන්න"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "නමක් යෝජනා කරන්න"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "අත් හරින්න"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 ගොනුවක් උඩගත කෙරේ"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
@@ -212,19 +212,19 @@ msgstr "ප්‍රමාණය"
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩ
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "නොබෙදු"
@@ -331,19 +327,19 @@ msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳ
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ගොනුව"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "ගොනු"
 
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index c5a4b17f205b55bdf3a0d828e48682c9a38f9247..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 6798cf2fca8d2491e02d3e286b63e08ba08925c8..40540cda0d3b1d0bb6d6723b4ba630190d070517 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index df981e0833cec9fd78127aed429ab0797fee404b..2dc217d93468f897d0a8dc933b3d2420d29c5b27 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 5822b061e8636b9d8b22d8d5b283463a2e9ce667..f6c17bac2d5b2af402e95d0302dd05ed2e761424 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "යෙදුම්"
 msgid "Admin"
 msgstr "පරිපාලක"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIP භාගත කිරීම් අක්‍රියයි"
@@ -53,15 +63,21 @@ msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
 msgid "Files need to be downloaded one by one."
 msgstr "ගොනු එකින් එක භාගත යුතුයි"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ගොනු වෙතට නැවත යන්න"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 මිනිත්තුවකට පෙර"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d මිනිත්තුවන්ට පෙර"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "අද"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d දිනකට පෙර"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
+#: template.php:296
+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 adccd8fe3f1cc002806a5f9ca84649b08207b0cd..83a432ea146b25fde67e7a36b76086cb83b6d934 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 73930576ac60f1776f419e4c4bb7c617ce094af2..6b2384d0b796141c93269b280c501a65289084b7 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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..2c7327788a32222fe59be382612597f46c49aef1 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 5b7c848c1ff1f2183d752ed50e33f37762e60e59..7972570bed6c2ee1a249c1c645fa2f7535a8c6a9 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-11 02:16+0200\n"
-"PO-Revision-Date: 2013-07-11 00:18+0000\n"
+"POT-Creation-Date: 2013-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-22 05:55+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"
@@ -128,43 +128,43 @@ 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:465
 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
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
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..9d5bd19be2dfbeaa2089718eb79d4c3bb92e2f71 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 1bf84e3f50b4209b7df2a99a7f9a7671f03a6036..8f5745242da382026d948ed282e18a0fdf6ce7b2 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -142,55 +142,55 @@ msgstr "December"
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "pred minútou"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minútami"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Pred 1 hodinou"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "Pred {hours} hodinami."
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "pred {days} dňami"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "Pred {months} mesiacmi."
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -226,8 +226,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:631 js/share.js:643
 msgid "Error"
 msgstr "Chyba"
 
@@ -247,123 +247,123 @@ msgstr "Zdieľané"
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "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:618
 msgid "Password protected"
 msgstr "Chránené heslom"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu expirácie"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email odoslaný"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Prístup odmietnutý"
 msgid "Cloud not found"
 msgstr "Nenájdené"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +495,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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,65 +517,65 @@ 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 ""
 
-#: 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ť"
 
@@ -608,7 +609,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 fc4b4d66c5ff90ed30170db3dc67401c317a8c3c..85a9aa852a27a285561dd2e76a41b05652e6423c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Zmazať"
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "nahradiť"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "pomôcť s menom"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "vykonať zmazanie"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 súbor sa posiela "
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "nahrávanie súborov"
 
@@ -205,7 +205,7 @@ msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -213,19 +213,19 @@ msgstr "Veľkosť"
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} súborov"
 
@@ -306,10 +306,6 @@ msgstr "Žiadny súbor. Nahrajte niečo!"
 msgid "Download"
 msgstr "SÅ¥ahovanie"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
@@ -332,19 +328,19 @@ msgstr "Čakajte, súbory sú prehľadávané."
 msgid "Current scanning"
 msgstr "Práve prezerané"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "priečinok"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "priečinky"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "súbor"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "súbory"
 
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index a0a8c3e5dd643324166f21fa17418012b5aa5060..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 5d9f542def259b95d3b8486763a7cab2e9d39a12..f48e3f693e9b78367f0ae1c4d4da9102981095b6 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index feeb9b2bb35d4734e6b6aec633fbed3b5b8cab8b..c5b4d1acca617fb303ab8ce988dbbbf4de0020aa 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_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-07-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 2e4b2d84383153032a2fe704fdada6c6797683cf..b480a7c3ce568f0f3cdf7be68ecc4ba1380caea7 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_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-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: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,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 ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nevybrali ste cestu"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Verzie"
+#: 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 "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 57c323b78991a018842e0cddbe9a81a0c2d47480..804de8e425ca85f016b7aa97669943e366041050 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Aplikácie"
 msgid "Admin"
 msgstr "Administrátor"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "webové služby pod Vašou kontrolou"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Sťahovanie súborov ZIP je vypnuté."
@@ -54,15 +64,21 @@ msgstr "Sťahovanie súborov ZIP je vypnuté."
 msgid "Files need to be downloaded one by one."
 msgstr "Súbory musia byť nahrávané jeden za druhým."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Späť na súbory"
 
-#: files.php:258
+#: 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 ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nedá sa zistiť"
 
@@ -190,58 +206,62 @@ msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pret
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "pred minútou"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "pred %d minútami"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Pred 1 hodinou"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Pred %d hodinami."
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "dnes"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "včera"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "pred %d dňami"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Pred %d mesiacmi."
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "minulý rok"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "pred rokmi"
 
+#: template.php:296
+msgid "Caused by:"
+msgstr ""
+
 #: 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 3dabc097d409ad7b19cdf888104fdf17ffc05381..b441612eae9805f1ce254eb7c1a12e9152054cda 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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 (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"
@@ -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,72 +394,72 @@ 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\" "
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 6f68454ac3de76ae350f6085f8388ae708ee1ba2..ee728d45d686e2a5fe6e2648a12a67335c1c85d1 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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 (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"
@@ -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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,12 +372,12 @@ 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 ""
 
@@ -390,17 +391,16 @@ 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."
+"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_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index ae90bb92d46978e69d8399ee96d4a3fd06f8efde..4ffa7e8e358fcc6fa911743c7473a92d843b4aac 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -4,14 +4,14 @@
 # 
 # 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"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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 (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"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV overenie"
 
 #: 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 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 ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 886355d0e8bf6fe750e6cfb0b1829b567cb4518f..551e7074e69e1c00b1378700b0825f180cb212f8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "december"
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minutami"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Pred 1 uro"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "pred {hours} urami"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "pred {days} dnevi"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "pred {months} meseci"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "Napaka"
 
@@ -248,123 +248,123 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Zaščiteno z geslom"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Napaka med nastavljanjem datuma preteka"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
@@ -402,7 +402,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"
@@ -467,7 +467,7 @@ msgstr "Dostop je prepovedan"
 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 +496,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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,65 +518,65 @@ 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 ""
 
-#: 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"
 
@@ -609,7 +610,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 037cdeb2d134d8d7a12421920f612c81ca7c7a48..a9c7afcf488502f3a4c480e65af174fef9b0f53c 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Izbriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "prekliči"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "izvedi opravilo brisanja"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "Pošiljanje 1 datoteke"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "poteka pošiljanje datotek"
 
@@ -205,7 +205,7 @@ msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
@@ -213,19 +213,19 @@ msgstr "Velikost"
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} datotek"
 
@@ -306,10 +306,6 @@ msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Prekliči souporabo"
@@ -332,19 +328,19 @@ msgstr "Poteka preučevanje datotek, počakajte ..."
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "direktorij"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "direktoriji"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "datoteka"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index b8b8016e8af511a7c4dac243dc7434afd394f572..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 bfd4a57fcac521d1ad23fa72cbed3f21cb3e19f3..46312bd3d27236b9f790990048f1fe2cb3d24eb0 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index ddb6e44fb58c88eb97e1f573ecc8a132e2e401b6..a08c29a65f55d9d95b03b54d533a201ebcf5b8d8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 0066eb12ce3dea47b727a5f73944620b08dc886b..1c5ae53da77251e827a5826e7eeeea7c32085f8a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Programi"
 msgid "Admin"
 msgstr "Skrbništvo"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
+#: 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."
@@ -54,15 +64,21 @@ msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoče prejeti le posamično."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +206,62 @@ msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "pred %d minutami"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Pred 1 uro"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "Pred %d urami"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "danes"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "včeraj"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "pred %d dnevi"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "Pred %d meseci"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "lansko leto"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "let nazaj"
 
+#: template.php:296
+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 bb78c0921bffd01d84ed0d5f79766bc1ca48a740..c79736efdaf5f940763e6ba54a0f931ec683d74c 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 1c2d51f7e6d28614b39d81095656096767e0aa25..63f47e94c89d996f5b866eb312b41a748c16b539 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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:56+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 fb94210cb4ae6657932562a773176cf486c9cb0a..80f500cd41eb9cbd5e038fe1fd151f2d204e6ede 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -142,55 +142,55 @@ msgstr "Dhjetor"
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minutë më parë"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuta më parë"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 orë më parë"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} orë më parë"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} ditë më parë"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} muaj më parë"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "muaj më parë"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "vite më parë"
 
@@ -226,8 +226,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:631 js/share.js:643
 msgid "Error"
 msgstr "Veprim i gabuar"
 
@@ -247,123 +247,123 @@ msgstr "Ndarë"
 msgid "Share"
 msgstr "Nda"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 ""
 
-#: 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:618
 msgid "Password protected"
 msgstr "Mbrojtur me kod"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Duke dërguar..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email-i u dërgua"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Ndalohet hyrja"
 msgid "Cloud not found"
 msgstr "Cloud-i nuk u gjet"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +495,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,65 +517,65 @@ 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"
 
@@ -608,7 +609,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 e926bfd3482ffb9156bff3390fa99cfe8c951183..1df65fed8f90938e46024402da802116e875280b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Elimino"
 msgid "Rename"
 msgstr "Riemërto"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Pezulluar"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ekziston"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zëvëndëso"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugjero një emër"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anulo"
 
-#: js/filelist.js:351
+#: 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:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "anulo"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "ekzekuto operacionin e eliminimit"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "Po ngarkohet 1 skedar"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "po ngarkoj skedarët"
 
@@ -204,7 +204,7 @@ msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i r
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Dimensioni"
 
@@ -212,19 +212,19 @@ msgstr "Dimensioni"
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 dosje"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} dosje"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 skedar"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} skedarë"
 
@@ -305,10 +305,6 @@ msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!"
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Hiq ndarjen"
@@ -331,19 +327,19 @@ msgstr "Skedarët po analizohen, ju lutemi pritni."
 msgid "Current scanning"
 msgstr "Analizimi aktual"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index f2f0b0d442e5bbf28f9e6d616f64b42c66e3c1e2..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 5168286b208c0d01374257849c81358166a1e858..4e79b13e39186096359ea5791b641000d5801e2e 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 91d0f4555fe797032f0a45a25e7824cb11d55508..0ec22599e092db0816c581132d0c4f4f360462c6 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 d0fefdc15b83ad3c892fd474333968812f5afe3a..35759acbd8e5224c96d27e99a94bee5e4e70e48a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "App"
 msgid "Admin"
 msgstr "Admin"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "shërbime web nën kontrollin tënd"
 
+#: 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."
@@ -53,15 +63,21 @@ msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
 msgid "Files need to be downloaded one by one."
 msgstr "Skedarët duhet të shkarkohen një nga një."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Kthehu tek skedarët"
 
-#: files.php:258
+#: 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"
 
@@ -189,58 +205,62 @@ msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkro
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minutë më parë"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuta më parë"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 orë më parë"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d orë më parë"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "sot"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "dje"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d ditë më parë"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d muaj më parë"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "vite më parë"
 
+#: template.php:296
+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 c3f7f1a2ab1f4b9bd5079a89d444f04279a59237..7591212a54e619400a2db4609f6cef20502fe3b9 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 6af69ba47bab2a64b2e4aeb1e43cd1fbf3f523b2..5cfd44d84b3be2c8921861ec16339638ec55c27c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 ec89a32268720ab6c5ff490a999a6dbb6f09395d..1c9c62a203e22afce1952f311279596ce7af621c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "Децембар"
 msgid "Settings"
 msgstr "Поставке"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "пре 1 минут"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "пре {minutes} минута"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "Пре једног сата"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "Пре {hours} сата (сати)"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "пре {days} дана"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "Пре {months} месеца (месеци)"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Грешка"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "Дели"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Порука је послата"
 
@@ -400,7 +400,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 "Корисничко име"
@@ -465,7 +465,7 @@ msgstr "Забрањен приступ"
 msgid "Cloud not found"
 msgstr "Облак није нађен"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "Одјава"
 
@@ -607,7 +608,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 0925b075dfeecc6b1a4dee6df360aa437674586e..75b75067cbd3e0f90db1a8d6283f69c9358bfb9a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "предложи назив"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "обриши"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "Отпремам 1 датотеку"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "датотеке се отпремају"
 
@@ -204,7 +204,7 @@ msgstr "Неисправно име фасцикле. Фасцикла „Shared
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Величина"
 
@@ -212,19 +212,19 @@ msgstr "Величина"
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
@@ -305,10 +305,6 @@ msgstr "Овде нема ничег. Отпремите нешто!"
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Укини дељење"
@@ -331,19 +327,19 @@ msgstr "Скенирам датотеке…"
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 2a0105b9322f49e7b4c4246470fa1e7f68b45fd6..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 cc9350827d7d22f70e5bdc959dd7acef5e51cb4b..8ecabd78e62ab2a0e10a0e16ac6c19c1b98f0de3 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index fdae5c6a3effbeff62e5e2e407291db1e31a312f..b458284e1c4a14d9842cc94b87396ae2d72d5821 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 b983fa2d1451a94ef77ce2ebdebdd42891aac40b..bd9dcab7ec78d814adf441dcf2ef9ce14b619b19 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Апликације"
 msgid "Admin"
 msgstr "Администратор"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "Преузимање ZIP-а је искључено."
@@ -53,15 +63,21 @@ msgstr "Преузимање ZIP-а је искључено."
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеке морате преузимати једну по једну."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Назад на датотеке"
 
-#: files.php:258
+#: 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 "није одређено"
 
@@ -189,58 +205,62 @@ msgstr "Ваш веб сервер тренутно не подржава син
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "пре 1 минут"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "пре %d минута"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "Пре једног сата"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "пре %d сата/и"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "данас"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "јуче"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "пре %d дана"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "пре %d месеца/и"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "прошле године"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "година раније"
 
+#: template.php:296
+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 fff55d8711bd98c68dd19d8570409419c3257c35..785e8f1cb8197bf123e24ee70edbb25d96c99ca5 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 59733647ab49dac11ec688d7875f012a8a0a6733..8b184dba592f2ce3d7fd06b1e6ded814d770725e 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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 (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 e5dcd6f9c57cafce1f9988ce73360ec7b29f7591..cebbf84433347f0b3a72c67a273443679daebfc0 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "Decembar"
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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"
@@ -465,7 +465,7 @@ msgstr ""
 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 +494,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,65 +516,65 @@ 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"
 
@@ -607,7 +608,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 2284f7b1372d032c20db7dd7c78bb0aa67763888..3e56d5a8ed6a12d49ff3c573401878629315204d 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
@@ -212,19 +212,19 @@ msgstr "Veličina"
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr "Ovde nema ničeg. Pošaljite nešto!"
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index b81595c84a333631c0f45c95a28a3eac1c8d2104..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 81c190aa49cffc09c768bb6c0c8b7ae6cd5246ff..e0cc5d36714d37a3a4d9ef7c46c92466a1de4da0 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 49ef6a996abb88255cc15442c774a918eb274347..14f576e80e69eb9c1a0a0ff5014938c5e7a52fab 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 cf73d85f33e7dbd2a114cba736a73ac64851c889..f2a53ab59e9bd46b64a2c5cc8fb8856bfc850e37 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Programi"
 msgid "Admin"
 msgstr "Adninistracija"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 ba2943c744f02993b1a618fcb5cc7dd0b1eea0af..473e8b4f089a2b22e48dfda0cc27d3bf33700b50 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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..e72d94938e242ad35127925cb82b356da7131e63 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-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"
@@ -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 8f5474fedbb72eea6a265b16dd74ed2f9065e3dd..3e6da0bdb3d63685cc0d13b006aed1e3d94f74cf 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -145,55 +145,55 @@ msgstr "December"
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuter sedan"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} timmar sedan"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} dagar sedan"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} månader sedan"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Fel"
 
@@ -250,123 +250,123 @@ msgstr "Delad"
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Lösenordsskyddad"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "E-post skickat"
 
@@ -375,7 +375,7 @@ 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:21
 msgid "The update was successful. Redirecting you to ownCloud now."
@@ -404,7 +404,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"
@@ -469,7 +469,7 @@ msgstr "Åtkomst förbjuden"
 msgid "Cloud not found"
 msgstr "Hittade inget moln"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -498,8 +498,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 ""
 
 #: templates/installation.php:32
 msgid ""
@@ -519,65 +520,65 @@ 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 ""
 
-#: 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"
 
@@ -611,7 +612,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 dd2b0c25d872a91ff4a83f44f6fd105ed7c34071..9fa27187a48cbe3ac669b0f8e14ca022083fd630 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -4,14 +4,15 @@
 # 
 # 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -131,43 +132,43 @@ msgstr "Radera"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "föreslå namn"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "utför raderingen"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 filuppladdning"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "filer laddas upp"
 
@@ -207,7 +208,7 @@ msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Storlek"
 
@@ -215,19 +216,19 @@ msgstr "Storlek"
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -308,10 +309,6 @@ msgstr "Ingenting här. Ladda upp något!"
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Sluta dela"
@@ -334,19 +331,19 @@ msgstr "Filer skannas, var god vänta"
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "mapp"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "mappar"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fil"
 
-#: templates/part.list.php:89
+#: 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..cfb13426d405a643b27ac84b7ca290911305c65f 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-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-21 14:20+0000\n"
+"Last-Translator: Stefan Gagner <stefan@mei-ya.se>\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,14 @@ 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 ""
+msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och rätt inställd. Kryperingsappen är därför tillsvidare inaktiverad."
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index aaa49ef79e9215bb637f6f74d20d086f3c5d5276..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 cada804a8b429d65a11b9efbb660ca38f9726a02..85deb24c85978d519ec5785771b888c957590847 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Stefan Gagner <stefan@mei-ya.se>\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 +20,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"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index cb6571604a175bad2b01d2edbe6df12c106cb64f..c70668b520e67f3cafcc3c9d9ed1bdacc400a8da 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
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 efdd6feb68791fb9fc419a793df3aa89efac8c73..8e2de52c4f73f76924cf4f6080237a9372bcde97 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -4,13 +4,14 @@
 # 
 # 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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-24 15:40+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"
@@ -42,10 +43,20 @@ msgstr "Program"
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:844
+#, 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: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."
@@ -54,15 +65,21 @@ msgstr "Nerladdning av ZIP är avstängd."
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +207,62 @@ msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkro
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuter sedan"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d timmar sedan"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "i går"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d dagar sedan"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "förra månaden"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d månader sedan"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "förra året"
 
-#: template.php:124
+#: template/functions.php:91
 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 493c563f391945e471cc46c726aa88227a22c13c..95d9e82bbd714cba2fb2b2a43459c2481bffded6 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -7,13 +7,14 @@
 # Jan Busk, 2013
 # Jan Busk, 2013
 # 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 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"
@@ -173,166 +174,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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 +398,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 eabab72a1f244c063f4312bf77321d92db996bba..cbc9a0fe215258803737094f10befa7f2bedbed0 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: medialabs\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: 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,9 +90,9 @@ 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."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -223,8 +223,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 ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -243,10 +243,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 ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -269,8 +270,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 ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -293,8 +294,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 ""
 
 #: 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 "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"
+"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 +373,14 @@ 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."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -391,18 +392,17 @@ 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."
-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ö!"
+"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/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index e8848e9ada136be51509bb64e580867b212426a3..dc9a523c43a266fe5596c084d913ad405b77328d 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-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: 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 ""
 
 #: 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."
+msgstr ""
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 834f706c36bb0922e1c94ed665c5444f20da2160..78b1d8f49878bbf98195a5be607b44807401ea32 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-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:293
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,134 +246,134 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 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 ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 2d020090c3f6c25ab31246d94017a41a745c5717..1187272d81b594af0163e1d29012debb2326064c 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-11 02:16+0200\n"
-"PO-Revision-Date: 2013-07-11 00:18+0000\n"
+"POT-Creation-Date: 2013-07-22 01:54-0400\n"
+"PO-Revision-Date: 2013-07-22 05:55+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"
@@ -128,43 +128,43 @@ 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:465
 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
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
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..5f0afb54abac7d50f8d52381fba7432ebb6b2a24 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-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,27 +41,43 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 +186,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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 276b044c6ad26e44ced1635b24d2569ab7c3a4e4..97e92571b5e1863fa271d119dff6d8a982d19c3b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "மார்கழி"
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 நிமிடத்திற்கு முன் "
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 மணித்தியாலத்திற்கு முன்"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{நாட்கள்} நாட்களுக்கு முன்"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{மாதங்கள்} மாதங்களிற்கு முன்"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "வழு"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "பயனாளர் பெயர்"
@@ -465,7 +465,7 @@ msgstr "அணுக தடை"
 msgid "Cloud not found"
 msgstr "Cloud காணப்படவில்லை"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "விடுபதிகை செய்க"
 
@@ -607,7 +608,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 d5facc43516a812139ada61808c1333c9d1685d1..c89bc46dcf0768b31e7ab8ab0f3d523624ae4b18 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "நீக்குக"
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "மாற்றிடுக"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "பெயரை பரிந்துரைக்க"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "இரத்து செய்க"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "அளவு"
 
@@ -212,19 +212,19 @@ msgstr "அளவு"
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
@@ -305,10 +305,6 @@ msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவத
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
@@ -331,19 +327,19 @@ msgstr "கோப்புகள் வருடப்படுகின்ற
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index d383bd48948403b9324ae32614e4bc94bd5eab69..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 0d0dd9d463962245a6a16f4d80efd8b7ec0d62af..4349314170bbbd022e87dd0fc268e25223b97212 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index bf23a92cd72ad0b679bf5f346d06ed83173aea00..1a7902d8eeec4651c147d6806993994a933bd400 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 1304184dcbc6ee8d0f8b546b7c444bb7890bcc67..b4f5cc473a7ee8d396773c2d203cc88c829d0bd8 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "செயலிகள்"
 msgid "Admin"
 msgstr "நிர்வாகம்"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
@@ -53,15 +63,21 @@ msgstr "வீசொலிப் பூட்டு பதிவிறக்க
 msgid "Files need to be downloaded one by one."
 msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "கோப்புகளுக்கு செல்க"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 நிமிடத்திற்கு முன் "
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d நிமிடங்களுக்கு முன்"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 மணித்தியாலத்திற்கு முன்"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d மணித்தியாலத்திற்கு முன்"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "இன்று"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d நாட்களுக்கு முன்"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d மாதத்திற்கு முன்"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
+#: template.php:296
+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 5ce40d851d767e06c61f26cd427cd864c3828203..17f5009f77b18c2a38cc781f31d4301be6b84bb3 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 0e74b7be40b11ca303fb9a3a37458ea611b84688..1c0ba580a0d11a3a8e384761adcb4a1971a228ff 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 d966389de7221cb596f0e5e543aa2be2f1186924..8dbec109d1a3a92d8cb5ab208a61f2c85270cc7f 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "డిసెంబర్"
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 నిమిషం క్రితం"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} నిమిషాల క్రితం"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 గంట క్రితం"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} గంటల క్రితం"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "ఈరోజు"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} రోజుల క్రితం"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} నెలల క్రితం"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "నెలల క్రితం"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "పొరపాటు"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "వాడుకరి పేరు"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "నిష్క్రమించు"
 
@@ -607,7 +608,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 71733cc6a30c1f93b739d22290dc641c7522e0cf..c2af073ef381f4558d1a0c2a4bbc4d9a29819b07 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "తొలగించు"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "రద్దుచేయి"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "పరిమాణం"
 
@@ -212,19 +212,19 @@ msgstr "పరిమాణం"
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 81da799ca81c2961bf52a663d1a8f1a6a3954087..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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_trashbin.po b/l10n/te/files_trashbin.po
index 11cdd5ea0a751c1670c8bde4d7fd846ac8da695f..e4b9155b2085c6d34a5b3ba631ece2327f65119d 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 387c72f66e428bacc2c5ad19cf4a27f83cbad2e2..5cb1c2bfb6cc7fec89d72ebe360ca70baa63d0e6 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-16 06:02+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 నిమిషం క్రితం"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 గంట క్రితం"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "ఈరోజు"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
+#: template.php:296
+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 589f3f07ff030ded7fbc4315e4ed320416d5649c..7eb9f85c79ca1cab9ff40becb052eee825b2e45f 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 8536964c89cbd1b4588676e0362c4e7b7588f44a..dd4df36550e7ce42ef7e31986cb3563aed0f6ec2 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 25243d7fcbba782600b747c59c06e35a01cc67f9..1935b6915c232cd1157aa402dc6613f45180cffa 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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"
@@ -141,55 +141,55 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr ""
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 ""
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 ""
 
@@ -607,7 +608,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 ea879ad519dfae80e7f82b0d3a4338c6f9714c33..ac8bd7a885d3d65cdad54a0c4ed04c1f66210c7a 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:55-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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 32d1b2ba667edd9281b7020dc9a946cb4ce45826..721ef48936c7377324858f08eefcc6def6f14efa 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:55-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"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 49d1e4dd0be425022a6afbfae46f340cd8b0c61f..af1ca9ed53449dd38d298e6a66942699ed1416cc 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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 e5ec53d581d9b077ed14ef2519fa898129fe5892..f145876b57b46da975b77141f589620b16c63c56 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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"
@@ -29,28 +29,28 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: 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 b972541ec238cc93425b548fefa979a05557ce4a..5e3076c9c86e8c59de39a9c9250b4557592363f3 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 2c266024fa98eea9ccf4b96e9e8378b8454903a5..6fcc8c66752076cd3bab67fcb77edc025a0f9117 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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 df82b4a2cb984fc0e65b7a20e308929323dd0cf5..ed5483fa5d4ab70de118fec6886ec231c6010e75 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-17 02:20-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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"
@@ -41,10 +41,20 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: defaults.php:33
+#: app.php:844
+#, 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 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 9f1f5b9796d9106a220ccca1d5234f3806138f4c..476fd661be6d80a00c7d3e75d54df3a007953f48 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-17 02:20-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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 e1e8c3fcf9209df857b8d52f5f931db13ebb352d..ec334d288385f431c07c52be3546e03a411f7b30 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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 55054625595a91d4b95c0ab5e72c3e99c72e228d..8c290c1f4031210199f51633425ad7dbb3e2b7c7 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-17 02:19-0400\n"
+"POT-Creation-Date: 2013-07-29 01:56-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 325e217edfcc8edb4157144dbc796d009eceea08..739c9d41375bc97411c24f73adce59eb752928ac 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "ธันวาคม"
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 นาทีก่อนหน้านี้"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} นาทีก่อนหน้านี้"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{day} วันก่อนหน้านี้"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} เดือนก่อนหน้านี้"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
@@ -246,123 +246,123 @@ msgstr "แชร์แล้ว"
 msgid "Share"
 msgstr "แชร์"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "กำลังส่ง..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "ส่งอีเมล์แล้ว"
 
@@ -400,7 +400,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 "ชื่อผู้ใช้งาน"
@@ -465,7 +465,7 @@ msgstr "การเข้าถึงถูกหวงห้าม"
 msgid "Cloud not found"
 msgstr "ไม่พบ Cloud"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "ออกจากระบบ"
 
@@ -607,7 +608,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 2941fe54d3df2c57306d7b220bced9bcec2bf16f..f58238d474b2645719cc4f29978ce7d15afc7bc3 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "ลบ"
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "แนะนำชื่อ"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "ดำเนินการตามคำสั่งลบ"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "การอัพโหลดไฟล์"
 
@@ -204,7 +204,7 @@ msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง ก
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "ขนาด"
 
@@ -212,19 +212,19 @@ msgstr "ขนาด"
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
@@ -305,10 +305,6 @@ msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์"
@@ -331,19 +327,19 @@ msgstr "ไฟล์กำลังอยู่ระหว่างการส
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ไฟล์"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "ไฟล์"
 
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 545d185507de3fc8bf0bdbcbd5a784191edda93c..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 eaed61ec2b8b87075bcdea3298f65f2b5d9b8152..74b76cfb8c11aece5ec58f7b848d687a954bd92c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 613773959b416b8420d2297a3db381a8a9a2cf11..d5d5485947b789c8b22a18fbbba6c47e86c236f7 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 bb2d98e83b42ec2a28298336a40de01b34d980c8..a12613c7221805a20d8975b0effeb810aa9ef499 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "แอปฯ"
 msgid "Admin"
 msgstr "ผู้ดูแล"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
@@ -53,15 +63,21 @@ msgstr "คุณสมบัติการดาวน์โหลด zip ถ
 msgid "Files need to be downloaded one by one."
 msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "กลับไปที่ไฟล์"
 
-#: files.php:258
+#: 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 "ไม่สามารถกำหนดได้"
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 นาทีก่อนหน้านี้"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d นาทีที่ผ่านมา"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 ชั่วโมงก่อนหน้านี้"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ชั่วโมงก่อนหน้านี้"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "วันนี้"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d วันที่ผ่านมา"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d เดือนมาแล้ว"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
+#: template.php:296
+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 f2c7ca1be94aa0c1b5f7c7b99cefb46e909e1e9d..635e9f94711ec354d469141a343ef61ef50d6f18 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 98e2eacf42e136f15ce76180610cc9b5227345f5..c7bf8e3f6d4ad993cc0c83691061e04786ca69c2 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 e0d0b1e1e937161faa3c1ebe5b8384d7355109d8..62f5a82fb76858f708f977e489e2af47c40e8eaf 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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."
@@ -142,55 +142,55 @@ msgstr "Aralık"
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "saniye önce"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 dakika önce"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} dakika önce"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 saat önce"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} saat önce"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "bugün"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "dün"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} gün önce"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "geçen ay"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} ay önce"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "ay önce"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "geçen yıl"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Hata"
 
@@ -247,123 +247,123 @@ msgstr "Paylaşılan"
 msgid "Share"
 msgstr "PaylaÅŸ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Paralo korumalı"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Geçerlilik tarihi tanımlama hatası"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Gönderiliyor..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Eposta gönderildi"
 
@@ -401,7 +401,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 +412,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"
@@ -466,7 +466,7 @@ msgstr "Erişim yasaklı"
 msgid "Cloud not found"
 msgstr "Bulut bulunamadı"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -475,7 +475,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 +495,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,65 +517,65 @@ 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"
 
@@ -608,12 +609,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 14ec0f42371ea59f31748e66879084eee5f3a437..e83270b90a9684bbaa214392c205f0ef934d2f5a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "Ä°sim deÄŸiÅŸtir."
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Öneri ad"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Silme işlemini gerçekleştir"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 dosya yüklendi"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "Dosyalar yükleniyor"
 
@@ -205,7 +205,7 @@ msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından re
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Boyut"
 
@@ -213,26 +213,26 @@ msgstr "Boyut"
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} dosya"
 
 #: 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"
@@ -306,10 +306,6 @@ msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Paylaşılmayan"
@@ -332,19 +328,19 @@ msgstr "Dosyalar taranıyor, lütfen bekleyin."
 msgid "Current scanning"
 msgstr "Güncel tarama"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "dizin"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "dizinler"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "dosya"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "dosyalar"
 
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 8827927e20bd052eda8f32e18613331796b81e15..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 e6bf14f636897eee8c91781a8f30be3c5f382a65..2b7db48119bf70cdfb86ac75f0d73b10fd700240 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index a65d3f862f540f67551719a030d77bc292d43601..840243165511773225db99de68001179329eb589 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 40fb4cfd737f4a0b4471d4278802393f90debcb3..f87d09b3415a2d8cf32ecf095f85fc5fcd20327a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "Uygulamalar"
 msgid "Admin"
 msgstr "Yönetici"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "Bilgileriniz güvenli ve şifreli"
 
+#: 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."
@@ -54,15 +64,21 @@ msgstr "ZIP indirmeleri kapatılmıştır."
 msgid "Files need to be downloaded one by one."
 msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Dosyalara dön"
 
-#: files.php:258
+#: 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"
 
@@ -190,58 +206,62 @@ msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırı
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 dakika önce"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d dakika önce"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 saat önce"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d saat önce"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "bugün"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "dün"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d gün önce"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "geçen ay"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d ay önce"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "geçen yıl"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "yıl önce"
 
+#: template.php:296
+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 b18e7201d0a7edb4fc41ea812097523d69501888..f11f04b70eb834066469f9f2155ddefff1ca2604 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 35b1f15cd414aed4d9862047e93b0457c3cce502..55a5f89cd034180461903d121d57bfa7f29c6051 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.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: 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 d2ea8cf7ce2aa6e418d2284941202e495ee6ac64..3978157b54967b9e8661bcce17f2c43f46524fb1 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "ÙƒÛ†Ù†Û•Ùƒ"
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 مىنۇت ئىلگىرى"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 سائەت ئىلگىرى"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "بۈگۈن"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "خاتالىق"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "ئىشلەتكۈچى ئاتى"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "تىزىمدىن چىق"
 
@@ -607,7 +608,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 97edf153118d9d304d143248fb97fbf94e3ed482..4881ae71621e990ad97d1a6a8cd7e6e5514900a8 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -128,43 +128,43 @@ msgstr "ئۆچۈر"
 msgid "Rename"
 msgstr "ئات ئۆزگەرت"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "كۈتۈۋاتىدۇ"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} مەۋجۇت"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ئالماشتۇر"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "تەۋسىيە ئات"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ۋاز كەچ"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "يېنىۋال"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 ھۆججەت يۈكلىنىۋاتىدۇ"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "ھۆججەت يۈكلىنىۋاتىدۇ"
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "چوڭلۇقى"
 
@@ -212,19 +212,19 @@ msgstr "چوڭلۇقى"
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 قىسقۇچ"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 ھۆججەت"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} ھۆججەت"
 
@@ -305,10 +305,6 @@ msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!"
 msgid "Download"
 msgstr "چۈشۈر"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ھەمبەھىرلىمە"
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index f8a2383b85dfc14087cf430cd268a5ab17dddb61..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 f35b23a055f89bf99e4e29be9df800f2369b9ea7..309e31e9e0df5fc6a42e72d7cfa215acc0e0d1ce 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 8e9fce5c93c611b950c4975f0aed997439505e86..018442e993671b0ebe38747a5b851e2e623ca115 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 54b8583804e716ee99fa3c4f3e06c3165b5a43a9..bba5b72f53f33de791c2b4e520eb00a467d0adf9 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -41,10 +41,20 @@ msgstr "ئەپلەر"
 msgid "Admin"
 msgstr ""
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 مىنۇت ئىلگىرى"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d مىنۇت ئىلگىرى"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 سائەت ئىلگىرى"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d سائەت ئىلگىرى"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "بۈگۈن"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d كۈن ئىلگىرى"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d ئاي ئىلگىرى"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 7e82b2ace969037f026bd41788844b07102a56b1..7743eec05958e73b954737f419ff9341d25890ea 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 53636a3d8c2486273e8f16e6ae3b5a353e9cc1a5..e533669f2c17d7c5efff70fde1693379e84d9c50 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 d06b6971841504c6b82190c167bfe54852551158..8a8af16600686c0703f11afb98868036c45c5863 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -141,55 +141,55 @@ msgstr "Грудень"
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 хвилину тому"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} хвилин тому"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 годину тому"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} години тому"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "сьогодні"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} днів тому"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "минулого місяця"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} місяців тому"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "місяці тому"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "Помилка"
 
@@ -246,123 +246,123 @@ msgstr "Опубліковано"
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Захищено паролем"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "Помилка при встановленні терміна дії"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "Надсилання..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Ел. пошта надіслана"
 
@@ -400,7 +400,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 "Ім'я користувача"
@@ -465,7 +465,7 @@ msgstr "Доступ заборонено"
 msgid "Cloud not found"
 msgstr "Cloud не знайдено"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,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 "Будь ласка, оновіть інсталяцію PHP для безпечного використання ownCloud."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -515,65 +516,65 @@ 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 "Вихід"
 
@@ -607,7 +608,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 8511430f69f63189e73da3361daa82de2b6be7bc..9da6d91c885d90976c886b64b63bbf07b15c8ac2 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "Видалити"
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "заміна"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "запропонуйте назву"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "відміна"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "замінено {new_name} на {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "виконати операцію видалення"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 файл завантажується"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "файли завантажуються"
 
@@ -204,7 +204,7 @@ msgstr "Невірне ім'я теки. Використання \"Shared\" з
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Розмір"
 
@@ -212,19 +212,19 @@ msgstr "Розмір"
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} файлів"
 
@@ -305,10 +305,6 @@ msgstr "Тут нічого немає. Відвантажте що-небудь
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Закрити доступ"
@@ -331,19 +327,19 @@ msgstr "Файли скануються, зачекайте, будь-ласка
 msgid "Current scanning"
 msgstr "Поточне сканування"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "файл"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "файли"
 
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index fdef1021895062693b9f2793ff19028824fa977a..6ed509717b8fc1031609662e45903b2b6d820ac4 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\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/uk/files_sharing.po b/l10n/uk/files_sharing.po
index b551e86e5b4654643ac13963d3c3db84d4a610de..a2aca19d51470ec4723605114a00244be3569525 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 28bdd23170923c8a360557c3ffaafdeaca5df4c0..3a2e28f20e934631c9190420a2a5fbc6a5667450 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
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 14d05ff54308dbde75c69dd5d1c20ad766a16efe..950fef2e264514f2c4d2f7e44e09de737194de4c 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Додатки"
 msgid "Admin"
 msgstr "Адмін"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIP завантаження вимкнено."
@@ -53,15 +63,21 @@ msgstr "ZIP завантаження вимкнено."
 msgid "Files need to be downloaded one by one."
 msgstr "Файли повинні бути завантаженні послідовно."
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Повернутися до файлів"
 
-#: files.php:258
+#: 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 "не може бути визначено"
 
@@ -189,58 +205,62 @@ msgstr "Ваш Web-сервер ще не налаштований належн
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 хвилину тому"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d хвилин тому"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 годину тому"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d годин тому"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "сьогодні"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "вчора"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d днів тому"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "минулого місяця"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d місяців тому"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "минулого року"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "роки тому"
 
+#: template.php:296
+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 289832daf85ebf362d9f85457aa2513a12d7bed8..6d73628bd52188652a0c9b48995e6b66441f5725 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 1eac58267c45455090b846439873c85c8751b23b..04fdad38c96e9b352a80b21e21293b8d9f9c9a9f 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 7baa7513be9169fcbca1ef617a8525e59d4baf60..0ca3c451c161972bf93dd71e72e66aa1f34d62b0 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "دسمبر"
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr ""
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr ""
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "ایرر"
 
@@ -246,123 +246,123 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr ""
 
@@ -400,7 +400,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 "یوزر نیم"
@@ -465,7 +465,7 @@ msgstr "پہنچ کی اجازت نہیں"
 msgid "Cloud not found"
 msgstr "نہیں مل سکا"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "لاگ آؤٹ"
 
@@ -607,7 +608,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 a7ab9c0ff88a1f34573d89746fd6e7ae84c11809..d51682f11999128e50175328d6e4d1a2a740f608 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "شئیرنگ ختم کریں"
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 36d9fff81f820067e473c5b0b616219ec82b1dab..a2b7ecb2843299f5f1a6606923d976c9d0ddcf14 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
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 a66b2a4cc99436ba4540bd9a7be4846001f2e9e9..6c94b885fdac5367f0a50cf881e60706ecbc2412 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-16 06:02+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "ایپز"
 msgid "Admin"
 msgstr "ایڈمن"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr ""
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 445c51fd77639b2b8d184169117f257ebef0741d..72bc49405e5bfbac859be49065111125b79a1748 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 90bea6ba8e15bdcfafc73e328e28f2b0f591497f..32adb4b6354418841dd8c9c26b5600b59ee11b1a 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 1776dfed374ca2402e4d3ab675fefcdf0db9cf1d..cc90423755cbcb7ae96be155790b6dbfe1ad1dfd 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -142,55 +142,55 @@ msgstr "Tháng 12"
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 phút trước"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} phút trước"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 giờ trước"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} giờ trước"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} ngày trước"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} tháng trước"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "tháng trước"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "năm trước"
 
@@ -226,8 +226,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:631 js/share.js:643
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -247,123 +247,123 @@ msgstr "Được chia sẻ"
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:620
+#: js/share.js:631
 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:643
 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:658
 msgid "Sending ..."
 msgstr "Đang gởi ..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email đã được gửi"
 
@@ -401,7 +401,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"
@@ -466,7 +466,7 @@ msgstr "Truy cập bị cấm"
 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 +495,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,65 +517,65 @@ 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"
 
@@ -608,7 +609,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 a9c7a227749cfeea624c0c9269323a6ceb0e111e..f7d88926a65783afabd0b00237a092aedead8660 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "Xóa"
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "Đang chờ"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "thay thế"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "tên gợi ý"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "hủy"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "đã thay thế {new_name} bằng {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "thực hiện việc xóa"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 tệp tin đang được tải lên"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "tệp tin đang được tải lên"
 
@@ -205,7 +205,7 @@ msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "Kích cỡ"
 
@@ -213,19 +213,19 @@ msgstr "Kích cỡ"
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} tập tin"
 
@@ -306,10 +306,6 @@ msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Bỏ chia sẻ"
@@ -332,19 +328,19 @@ msgstr "Tập tin đang được quét ,vui lòng chờ."
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "file"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "files"
 
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 7503ea3165313a5bae95064454e7f331d75a047f..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 a7c993e0b1a297d82d8b32b7ce994a9f5353cf35..4bcdd783ac74f080a6bd10639c1de2ba6363d1f1 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index d505f0a9b1c48f3fbe0cbd51e28ac275a1c20e3e..6ccab9a2e96e40c68cc80ec429f5845eff90157c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 33796a890ddbd0de330d90b82bbb8b8ce5e1b14e..83319251fa0824342f4220942da6a2f1f97f2e86 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "Ứng dụng"
 msgid "Admin"
 msgstr "Quản trị"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "dịch vụ web dưới sự kiểm soát của bạn"
 
+#: 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."
@@ -53,15 +63,21 @@ msgstr "Tải về ZIP đã bị tắt."
 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:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Trở lại tập tin"
 
-#: files.php:258
+#: 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"
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 phút trước"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d phút trước"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 giờ trước"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d giờ trước"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "hôm nay"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d ngày trước"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "tháng trước"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d tháng trước"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "năm trước"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "năm trước"
 
+#: template.php:296
+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 e5e2f97d217c061b71bc9a2ec780a4a1a4e278c1..10d18571889fc9d5bca352ad55a7167a406d996d 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 a300437e4129ca6d0386d1d2ea76ffaa7ad6623d..9ca92f2b61df9170e17a1e2d2535dcc70144fa18 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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: 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 9e024679acb698352af97db2ec9198fe4076e82e..a6beec56ef2b41e6f03120ba5b1c942a3157983e 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -143,55 +143,55 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours}小时前"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "上个月"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months}月前"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "年前"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "出错"
 
@@ -248,123 +248,123 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "密码保护"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "取消设置失效日期出错"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "设置失效日期出错"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "发送中……"
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "电子邮件已发送"
 
@@ -402,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 "用户名"
@@ -467,7 +467,7 @@ msgstr "禁止访问"
 msgid "Cloud not found"
 msgstr "云 没有被找到"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,9 @@ 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."
-msgstr "请升级您的PHP版本以稳定运行ownCloud。"
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,65 +518,65 @@ 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 "注销"
 
@@ -609,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/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 1355ae3f4201577c6c8990cde68e492e6c8d95bb..f04f187b9fa45e29fd4921bbf9ed999f578e8aca 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: hlx98007 <hlx98007@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -129,43 +129,43 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "等待中"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "推荐名称"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "已用 {old_name} 替换 {new_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "执行删除"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 个文件正在上传"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "个文件正在上传"
 
@@ -205,7 +205,7 @@ msgstr "不正确文件夹名。Shared是保留名,不能使用。"
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
@@ -213,19 +213,19 @@ msgstr "大小"
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} 个文件"
 
@@ -306,10 +306,6 @@ msgstr "这里没有东西.上传点什么!"
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "大小 (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消分享"
@@ -332,19 +328,19 @@ msgstr "正在扫描文件,请稍候."
 msgid "Current scanning"
 msgstr "正在扫描"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "文件夹"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "文件夹"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "文件"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 6691cb985f1c2960edd330045e25cd1b5aa7467a..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 807f512ae8cbc7e49090d6228e33ad16024a602a..9894200717adf00b2bc14e68295b511166a5a7b5 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index bb1e096e9d9062b1d40a112cf478d26f0549f43b..637de9a4ce6865e06906d30ae448bb008a204f99 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
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 687cb048948e83553f8e2ace33579b4462044c03..63fdc2e17b5af35cbf44da5da5f5e927e3cd7f3a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "程序"
 msgid "Admin"
 msgstr "管理员"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIP 下载已关闭"
@@ -53,15 +63,21 @@ msgstr "ZIP 下载已关闭"
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐个下载文件。"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "返回到文件"
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr "因WebDAV接口故障,您的网络服务器好像并未允许文件同
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d 分钟前"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "今天"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "昨天"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d 天前"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "上个月"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "去年"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "年前"
 
+#: template.php:296
+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 e14f28c32a85d02e620025bdfd00d69db250ab00..fd864864730cde05ff51ca509cb5ac84e9b61a7d 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: hlx98007 <hlx98007@gmail.com>\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: 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"
@@ -171,166 +171,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."
-msgstr "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问,或将移动数据文件夹移出网络服务器文档根目录。"
+"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”丢失。我们强烈建议打开此模块来获得 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 ""
 
-#: 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 "服务器没有可用的Internet连接。这意味着像挂载外部储存、更新提示和安装第三方插件等功能会失效。远程访问文件和发送邮件提醒也可能会失效。建议开启服务器的英特网网络。"
-
-#: 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 根用户将通过 http 协议每分钟调用一次 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"
+#: 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访问本站以设置强制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 "
@@ -388,72 +395,72 @@ 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\" "
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 3086ada92aafa46b7668516d5a7a50e1e0cbb87c..d65a51203b6b48867215ed89e75ea1e1fd973892 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 4366f45b442200f914af64e910e2f5da7916ae95..d3c2a4dfcbc3a5d278ed21f3ca6b7ac3e5711e0d 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "一分钟前"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} 小时前"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "年前"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "错误"
 
@@ -248,123 +248,123 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "邮件已发送"
 
@@ -402,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 "用户名"
@@ -467,7 +467,7 @@ msgstr "访问禁止"
 msgid "Cloud not found"
 msgstr "未找到云"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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,65 +518,65 @@ 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 "注销"
 
@@ -609,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/zh_CN/files.po b/l10n/zh_CN/files.po
index 10c790b0e3bec8278e3a28669e572b1bbf124d39..458dbf1fc95e009ef41ff66ee0064a24ac999683 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -131,43 +131,43 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "进行删除操作"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "文件上传中"
 
@@ -207,7 +207,7 @@ msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
@@ -215,19 +215,19 @@ msgstr "大小"
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} 个文件"
 
@@ -308,10 +308,6 @@ msgstr "这里还什么都没有。上传些东西吧!"
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消共享"
@@ -334,19 +330,19 @@ msgstr "文件正在被扫描,请稍候。"
 msgid "Current scanning"
 msgstr "当前扫描"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "文件"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index df1dde2e029350d6cb7a8a8d4586d019ff42a15f..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 a06182282e053992994fc64c990366b36314588f..8b9f31ec904a2ae5ce9665f3536bacd01b7a9aed 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 9bb57ed443eada10b0714f5cb4dc50eeb8fe6a19..80a48300065cbafdceb57039bd9f17720e1a44d6 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 10017f5d0e8675777c44dff7ae6927c54fec6495..35a0efd7f0288cbd07edbdd3aa38561e1d77d62a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "应用"
 msgid "Admin"
 msgstr "管理"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 msgid "web services under your control"
 msgstr "您控制的web服务"
 
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
 #: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
@@ -54,15 +64,21 @@ msgstr "ZIP 下载已经关闭"
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: files.php:258
+#: 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 "无法确定"
 
@@ -190,58 +206,62 @@ msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "一分钟前"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d 分钟前"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d小时前"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "今天"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "昨天"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d 天前"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "上月"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d 月前"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "去年"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "年前"
 
+#: template.php:296
+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 cd2128875c55c7a593043c2f71d2e51b0652cf09..954789e09a95650ee3c83387d9df03df1edf579d 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 64d8fba2598515d319b45bd23a8466200f0035ef..a30c7460648af2fbf0e490c63e5b2534df6036e3 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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:56+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 97492a31dbc181a7f5662a533ecc3e441faa21ae..bf8744fdda677d71c9d9a81010d712cb25a90f31 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 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"
@@ -141,55 +141,55 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "前一月"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "個月之前"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr ""
 
-#: js/js.js:737
+#: js/js.js:727
 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:631 js/share.js:643
 msgid "Error"
 msgstr "錯誤"
 
@@ -246,123 +246,123 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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:618
 msgid "Password protected"
 msgstr "密碼保護"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "傳送中"
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "郵件已傳"
 
@@ -400,7 +400,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 "用戶名稱"
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "未找到Cloud"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +494,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,65 +516,65 @@ 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 "登出"
 
@@ -607,7 +608,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 97cecef3f9f0e7cfdadb2ab3f241e373f39185e6..4381c2c2e40d29d0513784e59a24de163082168b 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -128,43 +128,43 @@ msgstr "刪除"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr ""
 
@@ -212,19 +212,19 @@ msgstr ""
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{}文件夾"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr ""
 
@@ -305,10 +305,6 @@ msgstr ""
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr ""
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消分享"
@@ -331,19 +327,19 @@ msgstr ""
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index eda1a7619c43970939360570e429419a1f9c93a0..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 08c7725e5c4a294914fab0642ed7c3468f6b9fe4..71a63b6ac2b7d6a74e53e8755172233b2a508927 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 9ab8ba20e8ff501024a3dcec3c9cd85931e4922a..76520fc0f99f351b9ff48d9f8ef15e7693607f01 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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"
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 958918ae5e265220a94acc2454eefae4ecce6b40..e6c8651e5c8ebe0e7c59565df384cad4e0648d4a 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -41,10 +41,20 @@ msgstr "軟件"
 msgid "Admin"
 msgstr "管理"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 ""
@@ -53,15 +63,21 @@ msgstr ""
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:258
+#: 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 ""
 
@@ -189,58 +205,62 @@ msgstr ""
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "今日"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "昨日"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "前一月"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr ""
 
+#: template.php:296
+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 cbd9b33b42cbe95fea2aa0605f5bc954e45e5b82..282acfbd73653ee7e1bd8341ada29aec5080dd87 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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: 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 971f6d8edfd9fecc6527b938487ea786a6efa01a..4d504c112d0e4a6d9cf90d19c9a93eb42aa37496 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+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"
@@ -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 39547ae9cbd386a14e6e83c27e48bcf8b52e0ac6..c590f48a35c3983000c1c0c261a2f6a859dd09a6 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:24+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:56+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"
@@ -143,55 +143,55 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:725
+#: js/js.js:715
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: js/js.js:726
+#: js/js.js:716
 msgid "1 minute ago"
 msgstr "1 分鐘前"
 
-#: js/js.js:727
+#: js/js.js:717
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分鐘前"
 
-#: js/js.js:728
+#: js/js.js:718
 msgid "1 hour ago"
 msgstr "1 小時之前"
 
-#: js/js.js:729
+#: js/js.js:719
 msgid "{hours} hours ago"
 msgstr "{hours} 小時前"
 
-#: js/js.js:730
+#: js/js.js:720
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:731
+#: js/js.js:721
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:732
+#: js/js.js:722
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:733
+#: js/js.js:723
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:734
+#: js/js.js:724
 msgid "{months} months ago"
 msgstr "{months} 個月前"
 
-#: js/js.js:735
+#: js/js.js:725
 msgid "months ago"
 msgstr "幾個月前"
 
-#: js/js.js:736
+#: js/js.js:726
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:737
+#: js/js.js:727
 msgid "years ago"
 msgstr "幾年前"
 
@@ -227,8 +227,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:631 js/share.js:643
 msgid "Error"
 msgstr "錯誤"
 
@@ -248,123 +248,123 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:671
 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 "將連結 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:618
 msgid "Password protected"
 msgstr "受密碼保護"
 
-#: js/share.js:620
+#: js/share.js:631
 msgid "Error unsetting expiration date"
 msgstr "解除過期日設定失敗"
 
-#: js/share.js:632
+#: js/share.js:643
 msgid "Error setting expiration date"
 msgstr "錯誤的到期日設定"
 
-#: js/share.js:647
+#: js/share.js:658
 msgid "Sending ..."
 msgstr "正在傳送..."
 
-#: js/share.js:658
+#: js/share.js:669
 msgid "Email sent"
 msgstr "Email 已寄出"
 
@@ -402,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 "使用者名稱"
@@ -467,7 +467,7 @@ msgstr "存取被拒"
 msgid "Cloud not found"
 msgstr "未發現雲端"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +496,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 ""
@@ -517,65 +518,65 @@ 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 ""
 
-#: 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 "登出"
 
@@ -609,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/zh_TW/files.po b/l10n/zh_TW/files.po
index 0d5deaac090e9fe42cf0d39f103e4a27939ad83f..26b717450ab823dc7dc9eb4981d1ad100b56bbf1 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:04+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"
@@ -129,43 +129,43 @@ msgstr "刪除"
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:304
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "建議檔名"
 
-#: js/filelist.js:304 js/filelist.js:306
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:351
+#: js/filelist.js:350
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:376
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "進行刪除動作"
 
-#: js/filelist.js:458
+#: js/filelist.js:457
 msgid "1 file uploading"
 msgstr "1 個檔案正在上傳"
 
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:460 js/filelist.js:518
 msgid "files uploading"
 msgstr "檔案正在上傳中"
 
@@ -205,7 +205,7 @@ msgstr "無效的資料夾名稱,'Shared' 的使用被 ownCloud 保留"
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:745
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
@@ -213,19 +213,19 @@ msgstr "大小"
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:765
+#: js/files.js:763
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:767
+#: js/files.js:765
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:775
+#: js/files.js:773
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:777
+#: js/files.js:775
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
@@ -306,10 +306,6 @@ msgstr "這裡什麼也沒有,上傳一些東西吧!"
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:80
-msgid "Size (MB)"
-msgstr "大小 (MB)"
-
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消共享"
@@ -332,19 +328,19 @@ msgstr "正在掃描檔案,請稍等。"
 msgid "Current scanning"
 msgstr "目前掃描"
 
-#: templates/part.list.php:76
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "目錄"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "目錄"
 
-#: templates/part.list.php:87
+#: templates/part.list.php:85
 msgid "file"
 msgstr "檔案"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:87
 msgid "files"
 msgstr "檔案"
 
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 0ad4c062c9a9544888aa3447cd63a4e642a0c1a4..9f2eb99c361db6f369b4baebe9663f5a8262a5ae 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-26 12:40+0000\n"
+"Last-Translator: Flymok <transifex@flymok.net>\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"
@@ -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."
@@ -71,7 +72,7 @@ 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 ""
+msgstr "請確認已安裝 PHP 5.3.3 或更新的版本並啟用 OpenSSL PHP 且正確設定。目前 encryption app 不可使用。"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -140,15 +141,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 9662a437708055e66d9a2980da35257faf027387..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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 605d8dd0be0e93a9150a83c89a93271a5f08d80a..7c2b7e20512acbf6a3f5a16eb283ae84f4d91478 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 2996152eb95d8b546a214f16b8e32507b2f9b806..1192686e09fbfc3ca3505775b061596e799f7843 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+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 (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
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 38bc29a66b18cd07106f46e8a04b619e0f3c6daf..813363fd041d3cff0be3b45aed77d6bab31df526 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
+"POT-Creation-Date: 2013-07-24 01:55-0400\n"
+"PO-Revision-Date: 2013-07-24 05:55+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"
@@ -42,10 +42,20 @@ msgstr "應用程式"
 msgid "Admin"
 msgstr "管理"
 
+#: app.php:844
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
 #: defaults.php:33
 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 "ZIP 下載已關閉。"
@@ -54,15 +64,21 @@ msgstr "ZIP 下載已關閉。"
 msgid "Files need to be downloaded one by one."
 msgstr "檔案需要逐一下載。"
 
-#: files.php:228 files.php:261
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "回到檔案列表"
 
-#: files.php:258
+#: 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 "無法判斷"
 
@@ -190,58 +206,62 @@ msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步,因為
 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
+#: template/functions.php:81
 msgid "1 minute ago"
 msgstr "1 分鐘前"
 
-#: template.php:115
+#: template/functions.php:82
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d 分鐘前"
 
-#: template.php:116
+#: template/functions.php:83
 msgid "1 hour ago"
 msgstr "1 小時之前"
 
-#: template.php:117
+#: template/functions.php:84
 #, php-format
 msgid "%d hours ago"
 msgstr "%d 小時之前"
 
-#: template.php:118
+#: template/functions.php:85
 msgid "today"
 msgstr "今天"
 
-#: template.php:119
+#: template/functions.php:86
 msgid "yesterday"
 msgstr "昨天"
 
-#: template.php:120
+#: template/functions.php:87
 #, php-format
 msgid "%d days ago"
 msgstr "%d 天前"
 
-#: template.php:121
+#: template/functions.php:88
 msgid "last month"
 msgstr "上個月"
 
-#: template.php:122
+#: template/functions.php:89
 #, php-format
 msgid "%d months ago"
 msgstr "%d 個月之前"
 
-#: template.php:123
+#: template/functions.php:90
 msgid "last year"
 msgstr "去年"
 
-#: template.php:124
+#: template/functions.php:91
 msgid "years ago"
 msgstr "幾年前"
 
+#: template.php:296
+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 000615b039785cc5da5c7f78d43722e2e22f5cd9..d3be39b8eddf76f5791d5097ae7cdd1e893d1c3d 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-17 02:20-0400\n"
-"PO-Revision-Date: 2013-07-17 05:25+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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: 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."
-msgstr "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效,我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取,或將您的資料目錄移出網頁伺服器的 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 "未偵測到 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 "去連線"
+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 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 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 "定期執行"
+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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "å°‘"
+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,72 +394,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/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index d73e26a63f88480ad24339109fa16a5bc96da951..c8a612eeb6d8a2a02fdac8ad8b1c157088974c3c 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-17 02:19-0400\n"
-"PO-Revision-Date: 2013-07-17 05:26+0000\n"
-"Last-Translator: chenanyeh <chnjsn1221@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: 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 baacf508d8e280ad185c4a7fe9ca3091a225c938..2437896157ae5c272556cfa82c852f84f8d3f356 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -839,9 +839,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/base.php b/lib/base.php
index 53aa7b09fd5b7c847596470057623cc6a4506bec..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,9 +422,13 @@ class OC {
 			}
 		}
 
-		if (!defined('PHPUNIT_RUN') and !(defined('DEBUG') and DEBUG)) {
-			OC\Log\ErrorHandler::register();
-			OC\Log\ErrorHandler::setLogger(OC_Log::$object);
+		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
@@ -833,3 +826,4 @@ if (!function_exists('get_temp_dir')) {
 }
 
 OC::init();
+
diff --git a/lib/config.php b/lib/config.php
index 00d9f5b4247e80fc47af09e8a4b34363cb820c61..e773e6e2eb0254a311efbba6176ecf835cf38047 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -144,7 +144,8 @@ class Config {
 				continue;
 			}
 			unset($CONFIG);
-			include $file;
+			// ignore errors on include, this can happen when doing a fresh install
+			@include $file;
 			if (isset($CONFIG) && is_array($CONFIG)) {
 				$this->cache = array_merge($this->cache, $CONFIG);
 			}
@@ -173,7 +174,7 @@ class Config {
 		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 'config'",
+				"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>.');
 		}
@@ -182,3 +183,4 @@ class Config {
 		\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..e70d66fc2ba2f8c6403aba9f8bf951ea1e1f1095 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,61 +31,41 @@ 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;
+	const BACKEND_DOCTRINE=2;
 
 	static private $preparedQueries = array();
 	static private $cachingEnabled = true;
 
 	/**
-	 * @var MDB2_Driver_Common
+	 * @var \Doctrine\DBAL\Connection
 	 */
-	static private $connection; //the prefered connection to use, either PDO or MDB2
+	static private $connection; //the preferred connection to use, only Doctrine
 	static private $backend=null;
 	/**
-	 * @var MDB2_Driver_Common
-	 */
-	static private $MDB2=null;
-	/**
-	 * @var PDO
+	 * @var \Doctrine\DBAL\Connection
 	 */
-	static private $PDO=null;
-	/**
-	 * @var MDB2_Schema
-	 */
-	static private $schema=null;
+	static private $DOCTRINE=null;
+
 	static private $inTransaction=false;
 	static private $prefix=null;
 	static private $type=null;
 
 	/**
 	 * check which backend we should use
-	 * @return int BACKEND_MDB2 or BACKEND_PDO
+	 * @return int BACKEND_DOCTRINE
 	 */
 	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;
+		return self::BACKEND_DOCTRINE;
 	}
 
 	/**
@@ -100,28 +82,24 @@ class OC_DB {
 		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;
+		if($backend==self::BACKEND_DOCTRINE) {
+			$success = self::connectDoctrine();
+			self::$connection=self::$DOCTRINE;
+			self::$backend=self::BACKEND_DOCTRINE;
 		}
 		return $success;
 	}
 
 	/**
-	 * connect to the database using pdo
+	 * connect to the database using doctrine
 	 *
 	 * @return bool
 	 */
-	public static function connectPDO() {
+	public static function connectDoctrine() {
 		if(self::$connection) {
-			if(self::$backend==self::BACKEND_MDB2) {
+			if(self::$backend!=self::BACKEND_DOCTRINE) {
 				self::disconnect();
-			}else{
+			} else {
 				return true;
 			}
 		}
@@ -134,169 +112,85 @@ 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
+		if(!self::$DOCTRINE) {
+			$config = new \Doctrine\DBAL\Configuration();
 			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
-			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',
 					);
 					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',
 					);
 					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',
 					);
 					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;
+					}
 					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;
 					break;
 				default:
 					return false;
 			}
+			try {
+				self::$DOCTRINE = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
+			} 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;
 	}
 
@@ -306,34 +200,19 @@ class OC_DB {
 	 * @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;
-				}
+			if ($limit === -1) {
+				$limit = null;
 			}
+			$platform = self::$connection->getDatabasePlatform();
+			$query = $platform->modifyLimitQuery($query, $limit, $offset);
 		} else {
 			if (isset(self::$preparedQueries[$query]) and self::$cachingEnabled) {
 				return self::$preparedQueries[$query];
@@ -354,26 +233,14 @@ 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{
+		if (self::$backend == self::BACKEND_DOCTRINE) {
+			try {
 				$result=self::$connection->prepare($query);
-			}catch(PDOException $e) {
-				throw new DatabaseException($e->getMessage(), $query);
+			} catch(\Doctrine\DBAL\DBALException $e) {
+				throw new \DatabaseException($e->getMessage(), $query);
 			}
 			// differentiate between query and manipulation
-			$result = new PDOStatementWrapper($result, $isManipulation);
+			$result=new OC_DB_StatementWrapper($result, $isManipulation);
 		}
 		if ((is_null($limit) || $limit == -1) and self::$cachingEnabled ) {
 			$type = OC_Config::getValue( "dbtype", "sqlite" );
@@ -412,7 +279,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
@@ -445,7 +312,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,7 +332,7 @@ 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!
@@ -478,12 +345,20 @@ class OC_DB {
 			$row = $result->fetchRow();
 			self::raiseExceptionOnError($row, 'fetching row for insertid failed');
 			return $row['id'];
-		} else if( $type === 'mssql' || $type === 'oci') {
+		} else if( $type === 'mssql') {
 			if($table !== null) {
 				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
 				$table = str_replace( '*PREFIX*', $prefix, $table );
 			}
-			$result = self::$connection->lastInsertId($table);
+			return self::$connection->lastInsertId($table);
+		}
+		if( $type === 'oci' ) {
+			if($table !== null) {
+				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
+				$suffix = '_SEQ';
+				$table = '"'.str_replace( '*PREFIX*', $prefix, $table ).$suffix.'"';
+			}
+			return self::$connection->lastInsertId($table);
 		} else {
 			if($table !== null) {
 				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
@@ -505,18 +380,14 @@ class OC_DB {
 	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::$DOCTRINE=false;
 		}
 
 		return true;
 	}
 
-	/**
+	/** else {
 	 * @brief saves database scheme to xml file
 	 * @param string $file name of file
 	 * @param int $mode
@@ -525,18 +396,8 @@ class OC_DB {
 	 * 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;
+		self::connectDoctrine();
+		return OC_DB_Schema::getDbStructure(self::$DOCTRINE, $file);
 	}
 
 	/**
@@ -547,134 +408,25 @@ 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;
+		self::connectDoctrine();
+		return OC_DB_Schema::createDbFromStructure(self::$DOCTRINE, $file);
 	}
 
 	/**
 	 * @brief update the database scheme
 	 * @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);
+		self::connectDoctrine();
+		try {
+			$result = OC_DB_Schema::updateDbFromStructure(self::$DOCTRINE, $file);
+		} catch (Exception $e) {
+			OC_Log::write('core', 'Failed to update database structure ('.$e.')', OC_Log::FATAL);
+			throw $e;
 		}
-
-		return true;
+		return $result;
 	}
 
 	/**
@@ -733,7 +485,7 @@ class OC_DB {
 
 		try {
 			$result = self::executeAudited($query, $inserts);
-		} catch(PDOException $e) {
+		} catch(\Doctrine\DBAL\DBALException $e) {
 			OC_Template::printExceptionErrorPage( $e );
 		}
 
@@ -765,20 +517,20 @@ class OC_DB {
 			$query = str_replace( '`', '"', $query );
 			$query = str_ireplace( 'NOW()', 'datetime(\'now\')', $query );
 			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
-		}elseif( $type == 'pgsql' ) {
+		} elseif( $type == 'pgsql' ) {
 			$query = str_replace( '`', '"', $query );
 			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)',
 				$query );
-		}elseif( $type == 'oci'  ) {
+		} 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 );
+			$query = str_ireplace( 'UNIX_TIMESTAMP()', "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400", $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_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 			$query = str_replace( 'LENGTH(', 'LEN(', $query );
 			$query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query );
+			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'DATEDIFF(second,{d \'1970-01-01\'},GETDATE())', $query );
 
 			$query = self::fixLimitClauseForMSSQL($query);
 		}
@@ -848,9 +600,8 @@ class OC_DB {
 	 * @param string $tableName the table to drop
 	 */
 	public static function dropTable($tableName) {
-		self::connectMDB2();
-		self::$MDB2->loadModule('Manager');
-		self::$MDB2->dropTable($tableName);
+		self::connectDoctrine();
+		OC_DB_Schema::dropTable(self::$DOCTRINE, $tableName);
 	}
 
 	/**
@@ -858,50 +609,17 @@ 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);
-		}
+		self::connectDoctrine();
+		OC_DB_Schema::removeDBStructure(self::$DOCTRINE, $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();
+		self::connectDoctrine();
+		OC_DB_Schema::replaceDB(self::$DOCTRINE, $file);
 	}
 
 	/**
@@ -910,9 +628,6 @@ class OC_DB {
 	 */
 	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;
@@ -933,24 +648,16 @@ class OC_DB {
 	}
 
 	/**
-	 * 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,32 +675,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::$backend==self::BACKEND_PDO and self::$PDO) {
-			$msg = self::$PDO->errorCode() . ': ';
-			$errorInfo = self::$PDO->errorInfo();
+		if (self::$backend==self::BACKEND_DOCTRINE and self::$DOCTRINE) {
+			$msg = self::$DOCTRINE->errorCode() . ': ';
+			$errorInfo = self::$DOCTRINE->errorInfo();
 			if (is_array($errorInfo)) {
 				$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
 				$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
@@ -1015,180 +709,3 @@ class OC_DB {
 		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);
-		} 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->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/mdb2schemareader.php b/lib/db/mdb2schemareader.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ead9528c937d5b41d85b2103a7eb5182dbcf80a
--- /dev/null
+++ b/lib/db/mdb2schemareader.php
@@ -0,0 +1,241 @@
+<?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_MDB2SchemaReader {
+	static protected $DBNAME;
+	static protected $DBTABLEPREFIX;
+	static protected $platform;
+
+	/**
+	 * @param $file
+	 * @param $platform
+	 * @return \Doctrine\DBAL\Schema\Schema
+	 * @throws DomainException
+	 */
+	public static function loadSchemaFromFile($file, $platform) {
+		self::$DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
+		self::$DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
+		self::$platform = $platform;
+		$schema = new \Doctrine\DBAL\Schema\Schema();
+		$xml = simplexml_load_file($file);
+		foreach($xml->children() as $child) {
+			switch($child->getName()) {
+				case 'name':
+				case 'create':
+				case 'overwrite':
+				case 'charset':
+					break;
+				case 'table':
+					self::loadTable($schema, $child);
+					break;
+				default:
+					throw new DomainException('Unknown element: '.$child->getName());
+
+			}
+		}
+		return $schema;
+	}
+
+	/**
+	 * @param\Doctrine\DBAL\Schema\Schema $schema
+	 * @param $xml
+	 * @throws DomainException
+	 */
+	private static function loadTable($schema, $xml) {
+		foreach($xml->children() as $child) {
+			switch($child->getName()) {
+				case 'name':
+					$name = (string)$child;
+					$name = str_replace( '*dbprefix*', self::$DBTABLEPREFIX, $name );
+					$name = self::$platform->quoteIdentifier($name);
+					$table = $schema->createTable($name);
+					break;
+				case 'create':
+				case 'overwrite':
+				case 'charset':
+					break;
+				case 'declaration':
+					self::loadDeclaration($table, $child);
+					break;
+				default:
+					throw new DomainException('Unknown element: '.$child->getName());
+
+			}
+		}
+	}
+
+	/**
+	 * @param \Doctrine\DBAL\Schema\Table $table
+	 * @param $xml
+	 * @throws DomainException
+	 */
+	private static function loadDeclaration($table, $xml) {
+		foreach($xml->children() as $child) {
+			switch($child->getName()) {
+				case 'field':
+					self::loadField($table, $child);
+					break;
+				case 'index':
+					self::loadIndex($table, $child);
+					break;
+				default:
+					throw new DomainException('Unknown element: '.$child->getName());
+
+			}
+		}
+	}
+
+	private static function loadField($table, $xml) {
+		$options = array();
+		foreach($xml->children() as $child) {
+			switch($child->getName()) {
+				case 'name':
+					$name = (string)$child;
+					$name = self::$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;
+						// TODO
+						return;
+					}
+					break;
+				case 'length':
+					$length = (string)$child;
+					$options['length'] = $length;
+					break;
+				case 'unsigned':
+					$unsigned = self::asBool($child);
+					$options['unsigned'] = $unsigned;
+					break;
+				case 'notnull':
+					$notnull = self::asBool($child);
+					$options['notnull'] = $notnull;
+					break;
+				case 'autoincrement':
+					$autoincrement = self::asBool($child);
+					$options['autoincrement'] = $autoincrement;
+					break;
+				case 'default':
+					$default = (string)$child;
+					$options['default'] = $default;
+					break;
+				case 'comments':
+					$comment = (string)$child;
+					$options['comment'] = $comment;
+					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;
+				}
+				if (!empty($options['autoincrement']) && $options['autoincrement']) {
+					unset($options['default']);
+				}
+			}
+			if ($type == 'integer' && isset($options['length'])) {
+				$length = $options['length'];
+				if ($length < 4) {
+					$type = 'smallint';
+				}
+				else if ($length > 4) {
+					$type = 'bigint';
+				}
+			}
+			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));
+			}
+		}
+	}
+
+	private static function loadIndex($table, $xml) {
+		$name = null;
+		$fields = array();
+		foreach($xml->children() as $child) {
+			switch($child->getName()) {
+				case 'name':
+					$name = (string)$child;
+					break;
+				case 'primary':
+					$primary = self::asBool($child);
+					break;
+				case 'unique':
+					$unique = self::asBool($child);
+					break;
+				case 'field':
+					foreach($child->children() as $field) {
+						switch($field->getName()) {
+							case 'name':
+								$field_name = (string)$field;
+								$field_name = self::$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));
+		}
+	}
+
+	private static function asBool($xml) {
+		$result = (string)$xml;
+		if ($result == 'true') {
+			$result = true;
+		} else
+		if ($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/schema.php b/lib/db/schema.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa053c64ef05c38b4d8fe4a26d4fecf491ce7ea3
--- /dev/null
+++ b/lib/db/schema.php
@@ -0,0 +1,136 @@
+<?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_Schema {
+	/**
+	 * @brief saves database scheme to xml file
+	 * @param \Doctrine\DBAL\Connection $conn
+	 * @param string $file name of file
+	 * @param int|string $mode
+	 * @return bool
+	 *
+	 * TODO: write more documentation
+	 */
+	public static function getDbStructure( $conn, $file, $mode=MDB2_SCHEMA_DUMP_STRUCTURE) {
+		$sm = $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 static function createDbFromStructure( $conn, $file ) {
+		$toSchema = OC_DB_MDB2SchemaReader::loadSchemaFromFile($file, $conn->getDatabasePlatform());
+		return self::executeSchemaChange($conn, $toSchema);
+	}
+
+	/**
+	 * @brief update the database scheme
+	 * @param string $file file to read structure from
+	 * @return bool
+	 */
+	public static function updateDbFromStructure($conn, $file) {
+		$sm = $conn->getSchemaManager();
+		$fromSchema = $sm->createSchema();
+
+		$toSchema = OC_DB_MDB2SchemaReader::loadSchemaFromFile($file, $conn->getDatabasePlatform());
+
+		// 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 = $conn->getDatabasePlatform();
+		$tables = $schemaDiff->newTables + $schemaDiff->changedTables + $schemaDiff->removedTables;
+		foreach($tables as $tableDiff) {
+			$tableDiff->name = $platform->quoteIdentifier($tableDiff->name);
+		}
+
+
+		//$from = $fromSchema->toSql($conn->getDatabasePlatform());
+		//$to = $toSchema->toSql($conn->getDatabasePlatform());
+		//echo($from[9]);
+		//echo '<br>';
+		//echo($to[9]);
+		//var_dump($from, $to);
+		return self::executeSchemaChange($conn, $schemaDiff);
+	}
+
+	/**
+	 * @brief drop a table
+	 * @param string $tableName the table to drop
+	 */
+	public static function dropTable($conn, $tableName) {
+		$sm = $conn->getSchemaManager();
+		$fromSchema = $sm->createSchema();
+		$toSchema = clone $fromSchema;
+		$toSchema->dropTable($tableName);
+		$sql = $fromSchema->getMigrateToSql($toSchema, $conn->getDatabasePlatform());
+		$conn->execute($sql);
+	}
+
+	/**
+	 * remove all tables defined in a database structure xml file
+	 * @param string $file the xml file describing the tables
+	 */
+	public static function removeDBStructure($conn, $file) {
+		$fromSchema = OC_DB_MDB2SchemaReader::loadSchemaFromFile($file, $conn->getDatabasePlatform());
+		$toSchema = clone $fromSchema;
+		foreach($toSchema->getTables() as $table) {
+			$toSchema->dropTable($table->getName());
+		}
+		$comparator = new \Doctrine\DBAL\Schema\Comparator();
+		$schemaDiff = $comparator->compare($fromSchema, $toSchema);
+		self::executeSchemaChange($conn, $schemaDiff);
+	}
+
+	/**
+	 * @brief replaces the ownCloud tables with a new set
+	 * @param $file string path to the MDB2 xml db export file
+	 */
+	public static function replaceDB( $conn, $file ) {
+		$apps = OC_App::getAllApps();
+		self::beginTransaction();
+		// Delete the old tables
+		self::removeDBStructure( $conn, OC::$SERVERROOT . '/db_structure.xml' );
+
+		foreach($apps as $app) {
+			$path = OC_App::getAppPath($app).'/appinfo/database.xml';
+			if(file_exists($path)) {
+				self::removeDBStructure( $conn, $path );
+			}
+		}
+
+		// Create new tables
+		self::commit();
+	}
+
+	private static function executeSchemaChange($conn, $schema) {
+		$conn->beginTransaction();
+		foreach($schema->toSql($conn->getDatabasePlatform()) as $sql) {
+			$conn->query($sql);
+		}
+		$conn->commit();
+	}
+}
diff --git a/lib/db/statementwrapper.php b/lib/db/statementwrapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..f7bc45e068f8385fcbabbfee5602ddd4039fdcab
--- /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 31d6edc1874cbd44f94a152a76f917c19eb01783..a83084d92514af6276d6ac4c7cfd8c64d1d8612c 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -53,7 +53,7 @@ class OC_EventSource{
 	/**
 	 * send a message to the client
 	 * @param string $type
-	 * @param object $data
+	 * @param mixed $data
 	 *
 	 * if only one parameter is given, a typeless message will be send with that parameter as 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/scanner.php b/lib/files/cache/scanner.php
index 9b94a24f48123e3e6e20eb1c531cb2ab23f6cfd1..dd212d84cc531a038978a23cb9fa82ae0e7bb277 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 = '';
@@ -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) {
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 1bf7270c7f17422a787deb6f67cf7c504f83b7d7..d6ebe7d629a6d90e00332e7179f242de678c1f79 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -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
diff --git a/lib/files/utils/scanner.php b/lib/files/utils/scanner.php
new file mode 100644
index 0000000000000000000000000000000000000000..800bb64993429ba5f5dba1bd7149ac419f1984ab
--- /dev/null
+++ b/lib/files/utils/scanner.php
@@ -0,0 +1,89 @@
+<?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\Hooks\BasicEmitter;
+use OC\Files\Filesystem;
+
+/**
+ * Class Scanner
+ *
+ * Hooks available in scope \OC\Utils\Scanner
+ *  - scanFile(string $absolutePath)
+ *  - scanFolder(string $absolutePath)
+ *
+ * @package OC\Files\Utils
+ */
+class Scanner extends BasicEmitter {
+	/**
+	 * @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();
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount) {
+			$this->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
+		});
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount) {
+			$this->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..8fbf5f8641885cbee4500774e324b56eb84839c4 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 df0d120976df44e9ef9bff1e701d9efeb9f123cb..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);
 		}
 	}
 
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/ca.php b/lib/l10n/ca.php
index 93f7fa5f7bc456516f72740777f8aaece7b94414..14f9edfe34c908e357f8704ac1fad0051343d9ff 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -5,11 +5,14 @@
 "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ó",
@@ -49,5 +52,6 @@
 "%d months ago" => "fa %d mesos",
 "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\""
 );
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 5f11453bcdd6c78e992b9ea9eb31c2bad5a72e08..789328a3100ea4a241b58255026858f96552cf65 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "%d måneder siden",
 "last year" => "sidste år",
 "years ago" => "Ã¥r siden",
+"Caused by:" => "Forårsaget af:",
 "Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\""
 );
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 4ef02402b9bc0c76e80ac9837503e1056768d284..f1c4a1171e27fb67246aee1a0f25525cfaf21eb4 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "Vor %d Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
+"Caused by:" => "Verursacht durch:",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
 );
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 823d423abcd533a1e7c371ac254db720c5618f88..276e526e2ed2385b8ab65f43fc53d253ae94ba2c 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "Vor %d Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor  Jahren",
+"Caused by:" => "Verursacht durch:",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
 );
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 1f243a224e41e15c1ab24aca67b8c92fbd5299b3..66011e61a0d57faa26f097e9845aecfdd03e2504 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "Hace %d meses",
 "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\""
 );
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index e66771f7e747eec8e7967969ad987129269f3be3..da0f6fae84a70951c6ca4251254ed224a43fe9be 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -3,51 +3,55 @@
 "Personal" => "Personal",
 "Settings" => "Configuración",
 "Users" => "Usuarios",
-"Apps" => "Aplicaciones",
+"Apps" => "Apps",
 "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",
+"1 hour ago" => "hace 1 hora",
+"%d hours ago" => "hace %d horas",
 "today" => "hoy",
 "yesterday" => "ayer",
 "%d days ago" => "hace %d días",
 "last month" => "el mes pasado",
-"%d months ago" => "%d meses atrás",
+"%d months ago" => "hace %d meses",
 "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\""
 );
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 4da2c36d6acc508824d08c520db3054b61e8d58e..c2cd8ff0389d66ad7acc74a5ece8cf8030fd8f94 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "%d kuud tagasi",
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
+"Caused by:" => "Põhjustaja:",
 "Could not find category \"%s\"" => "Ei leia kategooriat \"%s\""
 );
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 028ad0a631efc08673ddd56cfbfd04360cd0428b..94b4cfb902ef7af1ce1f1612af0d530ab83bddd1 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -5,11 +5,14 @@
 "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.",
@@ -48,5 +52,6 @@
 "%d months ago" => "orain dela %d hilabete",
 "last year" => "joan den urtean",
 "years ago" => "urte",
+"Caused by:" => "Honek eraginda:",
 "Could not find category \"%s\"" => "Ezin da \"%s\" kategoria aurkitu"
 );
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 351f18c715588f9a45bbb25e0ab3f09331f6bafc..f5309d950816d35fdf1a52df169915b61fefa720 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "Vai %d meses",
 "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»"
 );
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 3aa04274fa3a7db07fd3bcf58ab037920684c543..7738dcc05c87f099cca97157d5e731d02f81fb29 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "%d hónapja",
 "last year" => "tavaly",
 "years ago" => "több éve",
+"Caused by:" => "Okozta:",
 "Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\""
 );
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 74483315ca016f9fbe1fc23722e3e324a94202bf..693f86b6b80be0811ca8b16a32e70be7692da58a 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "%d mesi fa",
 "last year" => "anno scorso",
 "years ago" => "anni fa",
+"Caused by:" => "Causato da:",
 "Could not find category \"%s\"" => "Impossibile trovare la categoria \"%s\""
 );
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 31245ea96f20e8fc9170087ecec04788e6da3068..1f32ebe402a10c7496f361692d2bc95eb44e4b83 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -17,6 +17,13 @@
 "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" => "ì´ˆ ì „",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index de80d1b5d56045a40e9435711892deb80f644deb..0a221b11f00407deaad490142b1332878f61688f 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "%d maanden geleden",
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
+"Caused by:" => "Gekomen door:",
 "Could not find category \"%s\"" => "Kon categorie \"%s\" niet vinden"
 );
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 029331fdec8206b9f6d769619fcac3ece2424287..23385e8c7d120cf56a74895e9170b0f74252b9be 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "%d meses atrás",
 "last year" => "último ano",
 "years ago" => "anos atrás",
+"Caused by:" => "Causados ​​por:",
 "Could not find category \"%s\"" => "Impossível localizar categoria \"%s\""
 );
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 7480026e920d43f5fd42e18989a5219c6effd90f..96cb5f65f56151e50ab602583dc678bfc8249dba 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "Há %d meses atrás",
 "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\""
 );
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 56776e574aaf153b1c38ba8ae4306a018029f419..0e2e806b4f6c1a6fd641bdf7792eacd87097898e 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -5,11 +5,14 @@
 "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",
@@ -49,5 +52,6 @@
 "%d months ago" => "%d månader sedan",
 "last year" => "förra året",
 "years ago" => "Ã¥r sedan",
+"Caused by:" => "Orsakad av:",
 "Could not find category \"%s\"" => "Kunde inte hitta kategorin \"%s\""
 );
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/factory.php b/lib/memcache/factory.php
index b1b49971031f2063e0f9f3d431c2925bb841782f..4c1b1ab207f228cbb5bb7a1774d2820733b0c6ad 100644
--- a/lib/memcache/factory.php
+++ b/lib/memcache/factory.php
@@ -18,6 +18,8 @@ class Factory {
 	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()) {
@@ -33,6 +35,6 @@ class Factory {
 	 * @return bool
 	 */
 	public function isAvailable() {
-		return XCache::isAvailable() || APC::isAvailable() || Memcached::isAvailable();
+		return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable() || Memcached::isAvailable();
 	}
 }
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/lib/public/image.php b/lib/public/image.php
new file mode 100644
index 0000000000000000000000000000000000000000..c6dd9a113ab81a50665ec327d69b81e6d3e4df2d
--- /dev/null
+++ b/lib/public/image.php
@@ -0,0 +1,29 @@
+<?php
+/**
+* ownCloud
+*
+* @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
+* 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 OCP;
+
+/**
+ * This class provides functions to handle images
+ */
+class Image extends \OC_Image {
+}
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 59f4cab75debfafffa3a956b3fa7151887f4d2f1..05a49890976f6d5d9b0d4855218081f6922aadc4 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -185,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/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..2d43cae1c0cc2cfce87c6c610471eecc051ff124
--- /dev/null
+++ b/lib/template/functions.php
@@ -0,0 +1,120 @@
+<?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 < 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;
+}
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..ee20f2e097197ff0ccda47a800abe9704b121375 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();
 	}
 
@@ -316,7 +316,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/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 7f7b9f334b4646bd9d2084e7393ec96cc2f78f45..b7dc2207e6c17a8a768a605c540754fe150a4f0a 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
  *
@@ -873,6 +871,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();
+		}
 	}
 
 	/**
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/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/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..0540d9b1c58227d9d12e151766678101d93b0441 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 {
@@ -171,7 +171,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 5d890db65b809e5ea17b4658891745054f6368c8..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();
@@ -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/ar.php b/settings/l10n/ar.php
index 0f23111abbb03a60bbff0d9ff07b12f8f403b48b..74580ea20309849b13959d9353eb80532fa4c1c2 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -36,20 +36,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 +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  عن طريق اتصال مشفر",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "الرجاء الاتصال مع خادم Owncloud  هذا عن طريق HTTPS لتفعيل أو تعطيل اجبار الدخول باستخدام ",
 "Log" => "سجل",
 "Log level" => "مستوى السجل",
 "More" => "المزيد",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 31e5132edd28c800e27a543b5ab9b406ff75961f..72b8accef12fc6b6395e134b240406917e8e05fa 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -23,7 +23,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" => "Още",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index ca75653bf851645b520084cfdaf604287395b8ee..fe29bdda13c5764749af1ad90692a1eb84f425c8 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 2c4cd545233b8372dde88263984dd27a9bfd2486..3eba11b212a4f6649f5a7d3d123b7af078b9bfcf 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -37,20 +37,14 @@
 "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.",
 "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>.",
 "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.",
 "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.",
 "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í",
@@ -62,8 +56,6 @@
 "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.",
 "Log" => "Záznam",
 "Log level" => "Úroveň záznamu",
 "More" => "Více",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 98a46f5aca9bc20cd2bd64fa66902d4ba5017b43..2dcfd502c4e14b5bb270d159665861872ba6eb0c 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -8,7 +8,6 @@
 "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",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 94312fce495028365c0684d83673ca7c9d0f1320..b614ece4a0a4fa2fd4958db38cb2388921db1428 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index d1b5ceb888a4930165f5eccc7759242a7e02dfd4..dbe2f0c96dbc7033d9b845c7800c6fd03891b8af 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index bb4ea79319009441085b60f49b02366e9788237f..8558b8ba43b745fe7cfcde8a0604b01164dab963 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -37,33 +37,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,10 +100,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>" => "Nutzen Sie diese Adresse um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>",
+"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",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 7ef677bc746e5594833a024dd02c4be61b9110e6..3ea16f8c7d968a9c505f65223310bda38670a3a3 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -37,20 +37,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 +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" => "Περισσότερα",
@@ -98,6 +90,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" => "Κωδικός Επαναφοράς Διαχειριστή ",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 5ca1cea113519d673af8430346bf665712c52937..04f3567e58d3b7e4a7f746bb506b79f67f90accc 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -25,7 +25,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",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 786266f56300100fdc497dbff9891d29befc7a66..6975103a488dcac3e448bd1932df944536e5597f 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 78c0c9ecbedd71e6d6d434df68a99789b3c0944a..2ea9138e2c87c7807f05a5112bd3b780aa482b3f 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 30d0956a7e9c3babc6639ab9825b259fde5c0f8c..58e1a5ecce8df006787c04e688104499ef5269aa 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4cf22c06a981e998b3349a57b831030c7cb4421d..aaec604d756e67ad03ca2b40e385292e98262614 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -37,33 +37,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 +97,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",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index a8a5e33824184366625cc64493aceb302e7c5cbc..fbb6a63f0747399e4f9163bf42c1286ab646395f 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -37,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 اراده کرده است دیگر کار نمی کند. ما قویاً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که فهرست اطلاعات شما غیر قابل دسترسی باشند یا فهرست اطلاعات را به خارج از ریشه ی اصلی وب سرور انتقال دهید.",
 "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" => "اجرای یک وظیفه با هر بار بارگذاری صفحه",
-"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 با صفحه  cron.php در ریشه owncloud .",
-"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 +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." => "از طریق HTTPS به این نسخه از ownCloud متصل شوید تا بتوانید SSL  را فعال یا غیر فعال نمایید.",
 "Log" => "کارنامه",
 "Log level" => "سطح ورود",
 "More" => "بیش‌تر",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index f81f786370400815eae9ece2faa6a0ba47b6ef48..4c5fc76fa833e54b2e06c936175cc01058691b43 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -37,8 +37,6 @@
 "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",
@@ -53,7 +51,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",
@@ -72,6 +69,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",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 3dd89edb90fccb345df2e0b304f2a2c107a1d30a..2c7e9d1cdbf5f1c04026bbc363eeaf2c83fdc75d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -37,20 +37,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 +56,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",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 16b10158c8cab6bf3cb7492ab14b0f22b45106f0..c0a42a3880539d06fff03d432692f7e5da686fda 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 077bc9e97f9c249ed57bba1645ffd7856edfbde1..83f7fd8a5fa32bf3e040f90d05e7b4f521221f09 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -37,10 +37,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",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index dba63166ef8d16f4fa43db05fb29db6ea041c193..8e29c6c779a14c9da9180b92f2e5189ef60b3df4 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 012f5885b423af7bda95431ae535fe368758a040..f832a85fbd4cbb043d8937c87b90cd7992492744 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -36,20 +36,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 +55,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",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index fecc82ec6d73c2ba6a75cc0da61bd921b563ccfe..782c4e5f806c408ff9c1c8cbfabcef7c92ef8bf6 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -27,7 +27,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",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index e95adbf3c71b268e62099b1187d28446303c9566..8c726fa0950337e0744f8144f5a1e5d696a1e8d5 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 2ec69194925d6df74f7827024586385cdfc75278..f30331038b6b334527382bd43e5b6f7ddd1dfefd 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -37,20 +37,14 @@
 "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ファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。 ",
 "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>をよく確認してください。",
 "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 サーバには有効なインターネット接続がありません。これは、外部ストレージのマウント、更新の通知、サードパーティ製アプリのインストール、のようないくつかの機能が動作しないことを意味しています。リモートからファイルにアクセスしたり、通知メールを送信したりすることもできません。全ての機能を利用するためには、このサーバのインターネット接続を有効にすることを推奨します。",
 "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 ファイルを呼び出して下さい。",
 "Sharing" => "共有",
 "Enable Share API" => "共有APIを有効にする",
 "Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
@@ -62,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." => "常にSSL接続を有効/無効にするために、HTTPS経由でこの ownCloud に接続して下さい。",
 "Log" => "ログ",
 "Log level" => "ログレベル",
 "More" => "もっと見る",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 302745052cc5f994f996e666dc501e8dbbdf8e02..ee58004b0db24a80ff491ea04dac1dc45e515215 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -37,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 დირექტორია არ იყოს დაშვებადი, ან გაიტანოთ 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 +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 დაცული კავშირით (https).",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "გთხოვთ დაუკავშირდეთ ownCloud–ს  HTTPS–ით რომ შეძლოთ SSL–ის ჩართვა გამორთვა.",
 "Log" => "ლოგი",
 "Log level" => "ლოგირების დონე",
 "More" => "უფრო მეტი",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 230a2185bfb0585425380f3ae8df786d0b12f526..b88e1b735a0abebdf50e65b1663d2cb8e17d3b46 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -37,20 +37,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 +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." => "SSL 강제 사용 설정을 변경하려면 ownCloud 인스턴스에 HTTPS로 연결하십시오.",
 "Log" => "로그",
 "Log level" => "로그 단계",
 "More" => "더 중요함",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 1e54dcb692676092ede0669956fe396ec1a8b034..75b3fe25c91193e1a958c963ec3708d2ea6be872 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -33,7 +33,6 @@
 "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",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index b9836634a03aa344ef0e70af666e7c5d3d71611e..84b4349d7b2bc829f777a695d910ab4e618cfdfb 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -36,20 +36,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 +55,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",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index f36bb8c7fce9b3321b8e067d613f00275a9a718d..66405a82434212f24dbef9eeff7770ed94764952 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -23,7 +23,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" => "Повеќе",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 408b8570fd297ac6eb9963eefaeaa9a9c72b82e5..4d37872d18a65daaa977f4847bc3e2806ca4f01d 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -37,20 +37,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 +56,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",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d51d1d3af5c3e4c78e8c8c583a581fdeb712dc95..d80157904fe37115de3c160a8002de33fc859708 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -37,33 +37,26 @@
 "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.",
 "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.",
 "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 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.",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Meer",
@@ -98,6 +91,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",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 642f523006175bea4f0d23fce1f5d16b6895e9da..f95416331ba95ecc7b303823e955ea053716fe28 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -37,20 +37,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 +56,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",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 34820d0349d2dd3d187f7777141e9d0cf825c16d..b0860ee451d18706cdd5fa21afc7e809c0696ccd 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -25,7 +25,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",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index d5f4f5a155e531666697b875cefd0f7d8cdeaf59..19b84faddd5e006b13f6b4f756abac950150ea39 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -37,20 +37,14 @@
 "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>.",
 "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",
@@ -62,8 +56,6 @@
 "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.",
 "Log" => "Logi",
 "Log level" => "Poziom logów",
 "More" => "Więcej",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index b33aa5ba50ce670c3d8f8a53132f65c2df402241..4c0d5fb52380aa6e5aaa163a3ec5ed114261c5cb 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 259b3032744af291a81a8c93fe4204a26d1b8bf4..776424f3b6c19f46d54e22d3b54b9b0f9cf64089 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -37,33 +37,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",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 5fced879701a526172122b8ff00f01ea0b478fc2..f11cb2903f406a109fb44d3e75b3747a9609c399 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -37,20 +37,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",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index ed6d2075618112e9b41bc4d206e66a2531554c8f..e1f561ecb599071be2d65e1b02babd42abf7abf1 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -37,20 +37,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." => "Ваш каталог с данными и файлы, вероятно, доступны из интернета. Файл .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-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 не имеет рабочего интернет-соединения. Это значит, что некоторые возможности отключены, например: подключение внешних носителей, уведомления об обновлениях, установка сторонних приложений.",
 "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 общего доступа",
@@ -62,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" => "Больше",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 5fa1eaf5f43cc2f86c5d7169799f796cf13f387e..7c5a8114f0b51524c8a2806032c464202bab90b6 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -20,7 +20,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" => "යළි යළිත් හුවමාරුවට අවසර දෙමි",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 952df66d399cc458a677b27c40138dded28a6d5d..83cfb499de5a2b7270269e79d39eca7d85b54404 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -37,20 +37,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 +56,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",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index f9b6942b97ef7e7568db84e52d20731ea19cbcd6..7cd143127cda043e3acbf98a764299ff34f55327 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -37,20 +37,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 +56,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č",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index c81e58e2fa09280fda68306c3292171862329dcc..78c051d10118cf1fdcfbe015060a813698f84e5e 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -5,7 +5,6 @@
 "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",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 1d1bcdddf5f0599b54b8442bf7d401600c76d024..4c1443a8d7c734097cec850f41cb07f56e974fd8 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -36,10 +36,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 +54,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" => "Више",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 567c21999015d1c45fea5ad4cb2db9754f77de39..eea0f39976dddbf3f079056294aeb2df3accda90 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -37,33 +37,29 @@
 "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.",
 "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.",
 "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",
 "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.",
 "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.",
 "Log" => "Logg",
 "Log level" => "Nivå på loggning",
 "More" => "Mer",
@@ -98,6 +94,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",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 64e9cb85aa7ed03a3d0a0f35145b3884246c3de2..4dfad2aa2b42c871801f34cc76e4c9a06812416b 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -22,7 +22,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>.",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 9725df23c243c716e286b883dd87e82953c334ab..006b666ff631c12cb6306f520cb7b97c0022aad6 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -30,11 +30,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 สำหรับแชร์ข้อมูลได้",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 30b637ab94da48aa90adad09423ca3927dbde0cd..7ce0af1a28d9be4ef857e6152d14e1e482463ff5 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -37,20 +37,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 +56,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 +90,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",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 8b567f3995aa24bd9cbaca5d0528c32964256052..cb4aa10965190e7891b3afc1cf4b706e7e0b3573 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -36,20 +36,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 +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 через шифроване з'єднання.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Будь ласка, під'єднайтесь до цього ownCloud за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
 "Log" => "Протокол",
 "Log level" => "Рівень протоколювання",
 "More" => "Більше",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 4768e9b243e6f2f0a111871f450ec1774a264296..1c929746a3fc1c5d82a9989fdb3ac7c9d7ddcb20 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -31,11 +31,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",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 789c93de23bc7722b5bd1ed2aec53fc7cb8f0a5f..756fd2f33e29942dcb70ffbed1884445345d5ebe 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -37,20 +37,14 @@
 "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 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问,或将移动数据文件夹移出网络服务器文档根目录。",
 "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”丢失。我们强烈建议打开此模块来获得 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”。",
 "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." => "服务器没有可用的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",
 "Sharing" => "分享",
 "Enable Share API" => "开启分享API",
 "Allow apps to use the Share API" => "允许应用使用分享API",
@@ -62,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." => "请先使用HTTPS访问本站以设置强制SSL的开关。",
 "Log" => "日志",
 "Log level" => "日志等级",
 "More" => "更多",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 7a11845404f40fcf3c8b1b6a4b0b7cfdaf5f0c40..47fcc54f4303d3a1c85c4e6f4fa321d85b6ce00e 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -37,20 +37,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 +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." => "请经由HTTPS连接到这个ownCloud实例来启用或禁用强制SSL.",
 "Log" => "日志",
 "Log level" => "日志级别",
 "More" => "更多",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 74040fcfa2ddabbbce448f7e40b73c88f18d03f4..ecafdcc8451978546c35ab58b35398105d733e8b 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -13,8 +13,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 +29,39 @@
 "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 。",
 "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-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" => "定期執行",
+"Internet connection not working" => "無網際網路存取",
+"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 。",
 "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 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 的選項。",
 "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" => "選擇一個應用程式",
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 ee5ebae708ffa022755a61f3d151dff67444640c..b9d9b09f5d0149b7416a1eef743991a1a9cf346f 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,8 +4,6 @@
  * See the COPYING-README file.
  */?>
 
-<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-
 <div class="clientsbox">
 	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
@@ -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/lib/db.php b/tests/lib/db.php
index 69e3542f9263f4a29cdf2b309cdb014fb6089464..e817a2db5edc3dd9ca53ccdfb0d6654be639f244 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);
@@ -94,7 +94,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/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/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/memcache/apc.php b/tests/lib/memcache/apc.php
index 6b2a49470ba21d7391ae6920c2f83e33ff27222a..e5d753a4fa5e27381651fd1643238bc0eaacadd4 100644
--- a/tests/lib/memcache/apc.php
+++ b/tests/lib/memcache/apc.php
@@ -15,6 +15,10 @@ class APC extends Cache {
 			$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/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/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;
+	}
+}