diff --git a/3rdparty b/3rdparty
index 184f0a59f87c590ee7e89ced401205a87f213954..da3c9f651a26cf076249ebf25c477e3791e69ca3 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 184f0a59f87c590ee7e89ced401205a87f213954
+Subproject commit da3c9f651a26cf076249ebf25c477e3791e69ca3
diff --git a/apps/files/ajax/upgrade.php b/apps/files/ajax/upgrade.php
deleted file mode 100644
index a3383a8863ff24f380e3f385406ab1ebf64bfd61..0000000000000000000000000000000000000000
--- a/apps/files/ajax/upgrade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-set_time_limit(0); //scanning can take ages
-\OC::$session->close();
-
-$user = OC_User::getUser();
-$eventSource = new OC_EventSource();
-$listener = new UpgradeListener($eventSource);
-$legacy = new \OC\Files\Cache\Legacy($user);
-
-if ($legacy->hasItems()) {
-	OC_Hook::connect('\OC\Files\Cache\Upgrade', 'migrate_path', $listener, 'upgradePath');
-
-	OC_DB::beginTransaction();
-	$upgrade = new \OC\Files\Cache\Upgrade($legacy);
-	$count = $legacy->getCount();
-	$eventSource->send('total', $count);
-	$upgrade->upgradePath('/' . $user . '/files');
-	OC_DB::commit();
-}
-\OC\Files\Cache\Upgrade::upgradeDone($user);
-$eventSource->send('done', true);
-$eventSource->close();
-
-class UpgradeListener {
-	/**
-	 * @var OC_EventSource $eventSource
-	 */
-	private $eventSource;
-
-	private $count = 0;
-	private $lastSend = 0;
-
-	public function __construct($eventSource) {
-		$this->eventSource = $eventSource;
-	}
-
-	public function upgradePath($path) {
-		$this->count++;
-		if ($this->count > ($this->lastSend + 5)) {
-			$this->lastSend = $this->count;
-			$this->eventSource->send('count', $this->count);
-		}
-	}
-}
diff --git a/apps/files/index.php b/apps/files/index.php
index ad7a2e210ed50b9e588e08235e0c6aac3071f9e6..c66cd40fb56150a981079c7536f413cb40617ceb 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -62,22 +62,17 @@ if ($isIE8 && isset($_GET['dir'])){
 $ajaxLoad = false;
 $files = array();
 $user = OC_User::getUser();
-if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we need to upgrade the cache
-	$needUpgrade = true;
-} else {
-	if ($isIE8){
-		// after the redirect above, the URL will have a format
-		// like "files#?dir=path" which means that no path was given
-		// (dir is not set). In that specific case, we don't return any
-		// files because the client will take care of switching the dir
-		// to the one from the hash, then ajax-load the initial file list
-		$files = array();
-		$ajaxLoad = true;
-	}
-	else{
-		$files = \OCA\Files\Helper::getFiles($dir);
-	}
-	$needUpgrade = false;
+if ($isIE8){
+    // after the redirect above, the URL will have a format
+    // like "files#?dir=path" which means that no path was given
+    // (dir is not set). In that specific case, we don't return any
+    // files because the client will take care of switching the dir
+    // to the one from the hash, then ajax-load the initial file list
+    $files = array();
+    $ajaxLoad = true;
+}
+else{
+    $files = \OCA\Files\Helper::getFiles($dir);
 }
 
 $config = \OC::$server->getConfig();
@@ -97,62 +92,56 @@ $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir
 
 $permissions = $dirInfo->getPermissions();
 
-if ($needUpgrade) {
-	OCP\Util::addscript('files', 'upgrade');
-	$tmpl = new OCP\Template('files', 'upgrade', 'user');
-	$tmpl->printPage();
-} else {
-	// information about storage capacities
-	$storageInfo=OC_Helper::getStorageInfo($dir);
-	$freeSpace=$storageInfo['free'];
-	$uploadLimit=OCP\Util::uploadLimit();
-	$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
-	$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
-	// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
-	$encryptionInitStatus = 2;
-	if (OC_App::isEnabled('files_encryption')) {
-		$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
-		$encryptionInitStatus = $session->getInitialized();
-	}
-
-	$trashEnabled = \OCP\App::isEnabled('files_trashbin');
-	$trashEmpty = true;
-	if ($trashEnabled) {
-		$trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
-	}
+// information about storage capacities
+$storageInfo=OC_Helper::getStorageInfo($dir);
+$freeSpace=$storageInfo['free'];
+$uploadLimit=OCP\Util::uploadLimit();
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
+// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
+$encryptionInitStatus = 2;
+if (OC_App::isEnabled('files_encryption')) {
+    $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+    $encryptionInitStatus = $session->getInitialized();
+}
 
-	$isCreatable = \OC\Files\Filesystem::isCreatable($dir . '/');
-	$fileHeader = (!isset($files) or count($files) > 0);
-	$emptyContent = ($isCreatable and !$fileHeader) or $ajaxLoad;
-
-	OCP\Util::addscript('files', 'fileactions');
-	OCP\Util::addscript('files', 'files');
-	OCP\Util::addscript('files', 'keyboardshortcuts');
-	$tmpl = new OCP\Template('files', 'index', 'user');
-	$tmpl->assign('fileList', $list->fetchPage());
-	$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
-	$tmpl->assign('dir', $dir);
-	$tmpl->assign('isCreatable', $isCreatable);
-	$tmpl->assign('permissions', $permissions);
-	$tmpl->assign('files', $files);
-	$tmpl->assign('trash', $trashEnabled);
-	$tmpl->assign('trashEmpty', $trashEmpty);
-	$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); // minimium of freeSpace and uploadLimit
-	$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-	$tmpl->assign('freeSpace', $freeSpace);
-	$tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
-	$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-	$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
-	$tmpl->assign('isPublic', false);
-	$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
-	$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
-	$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes'));
-	$tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
-	$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
-	$tmpl->assign('disableSharing', false);
-	$tmpl->assign('ajaxLoad', $ajaxLoad);
-	$tmpl->assign('emptyContent', $emptyContent);
-	$tmpl->assign('fileHeader', $fileHeader);
-
-	$tmpl->printPage();
+$trashEnabled = \OCP\App::isEnabled('files_trashbin');
+$trashEmpty = true;
+if ($trashEnabled) {
+    $trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
 }
+
+$isCreatable = \OC\Files\Filesystem::isCreatable($dir . '/');
+$fileHeader = (!isset($files) or count($files) > 0);
+$emptyContent = ($isCreatable and !$fileHeader) or $ajaxLoad;
+
+OCP\Util::addscript('files', 'fileactions');
+OCP\Util::addscript('files', 'files');
+OCP\Util::addscript('files', 'keyboardshortcuts');
+$tmpl = new OCP\Template('files', 'index', 'user');
+$tmpl->assign('fileList', $list->fetchPage());
+$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
+$tmpl->assign('dir', $dir);
+$tmpl->assign('isCreatable', $isCreatable);
+$tmpl->assign('permissions', $permissions);
+$tmpl->assign('files', $files);
+$tmpl->assign('trash', $trashEnabled);
+$tmpl->assign('trashEmpty', $trashEmpty);
+$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); // minimium of freeSpace and uploadLimit
+$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+$tmpl->assign('freeSpace', $freeSpace);
+$tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
+$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
+$tmpl->assign('isPublic', false);
+$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
+$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
+$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes'));
+$tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
+$tmpl->assign('disableSharing', false);
+$tmpl->assign('ajaxLoad', $ajaxLoad);
+$tmpl->assign('emptyContent', $emptyContent);
+$tmpl->assign('fileHeader', $fileHeader);
+
+$tmpl->printPage();
diff --git a/apps/files/js/upgrade.js b/apps/files/js/upgrade.js
deleted file mode 100644
index 714adf824a1841e6a56e10822b2a436c6ad27670..0000000000000000000000000000000000000000
--- a/apps/files/js/upgrade.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2014
- *
- * This file is licensed under the Affero General Public License version 3
- * or later.
- *
- * See the COPYING-README file.
- *
- */
-
-/* global OC */
-$(document).ready(function () {
-	var eventSource, total, bar = $('#progressbar');
-	console.log('start');
-	bar.progressbar({value: 0});
-	eventSource = new OC.EventSource(OC.filePath('files', 'ajax', 'upgrade.php'));
-	eventSource.listen('total', function (count) {
-		total = count;
-		console.log(count + ' files needed to be migrated');
-	});
-	eventSource.listen('count', function (count) {
-		bar.progressbar({value: (count / total) * 100});
-		console.log(count);
-	});
-	eventSource.listen('done', function () {
-		document.location.reload();
-	});
-});
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index f63f65162a8004a52a18dc7cf720512a3ea8f516..e1c7decdbbdae3f9d1cacbc1db03f189693bd464 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
 "Could not move %s" => " No s'ha pogut moure %s",
 "File name cannot be empty." => "El nom del fitxer no pot ser buit.",
+"\"%s\" is an invalid file name." => "\"%s\" no es un fitxer vàlid.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
+"The target folder has been moved or deleted." => "La carpeta de destí s'ha mogut o eliminat.",
 "The name %s is already used in the folder %s. Please choose a different name." => "El nom %s ja s'usa en la carpeta %s. Indiqueu un nom diferent.",
 "Not a valid source" => "No és un origen vàlid",
 "Server is not allowed to open URLs, please check the server configuration" => "El servidor no té autorització per obrir URLs, comproveu la configuració del servidor",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "Invalid directory." => "Directori no vàlid.",
 "Files" => "Fitxers",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
+"Total file size {size1} exceeds upload limit {size2}" => "Mida total del fitxer {size1} excedeix el límit de pujada {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
 "Upload cancelled." => "La pujada s'ha cancel·lat.",
 "Could not get result from server." => "No hi ha resposta del servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
@@ -48,6 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
 "{dirs} and {files}" => "{dirs} i {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
+"\"{name}\" is an invalid file name." => "\"{name}\" no es un fitxer vàlid.",
 "Your storage is full, files can not be updated or synced anymore!" => "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
 "Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 02ab6e152508b00c74bc572e04496e5ad127b7ea..3fac6f15c08a8637430a1ed6a3ec91634b094fea 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem",
 "Could not move %s" => "Nelze přesunout %s",
 "File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
+"\"%s\" is an invalid file name." => "\"%s\" je neplatným názvem souboru.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
+"The target folder has been moved or deleted." => "Cílová složka byla přesunuta nebo smazána.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Název %s ve složce %s již existuje. Vyberte prosím jiné jméno.",
 "Not a valid source" => "Neplatný zdroj",
 "Server is not allowed to open URLs, please check the server configuration" => "Server není oprávněn otevírat adresy URL. Ověřte, prosím, konfiguraci serveru.",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "Invalid directory." => "Neplatný adresář",
 "Files" => "Soubory",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
+"Total file size {size1} exceeds upload limit {size2}" => "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
 "Upload cancelled." => "Odesílání zrušeno.",
 "Could not get result from server." => "Nepodařilo se získat výsledek ze serveru.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
@@ -48,6 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
 "{dirs} and {files}" => "{dirs} a {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
+"\"{name}\" is an invalid file name." => "\"{name}\" je neplatným názvem souboru.",
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
diff --git a/apps/files/templates/upgrade.php b/apps/files/templates/upgrade.php
deleted file mode 100644
index e03f086e47d487518539afdc6d0b8c345c1de706..0000000000000000000000000000000000000000
--- a/apps/files/templates/upgrade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="upgrade">
-	<?php p($l->t('Upgrading filesystem cache...'));?>
-	<div id="progressbar" />
-</div>
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index cf6c265027c171f08cee396b0104fe1757a06efe..345c01a0d4a67c14641aca49504e04e5ae7edb1e 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL مفعل و مهيئ بشكل صحيح. حتى الان برنامج التتشفير تم تعطيلة.",
 "Following users are not set up for encryption:" => "المستخدمين التاليين لم يتم تعيين لهم التشفيير:",
 "Initial encryption started... This can take some time. Please wait." => "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.",
+"Initial encryption running... Please try again later." => "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا",
 "Go directly to your " => "انتقل مباشرة الى ",
 "personal settings" => "اعدادات شخصية",
 "Encryption" => "التشفير",
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 23897c1818658680919965cb3a4709beac8eabc9..3414796f62bcf91315efc34b9d0adba1a5a069b7 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
 "Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
 "Initial encryption started... This can take some time. Please wait." => "La encriptació inicial ha començat... Pot trigar una estona, espereu.",
+"Initial encryption running... Please try again later." => "encriptació inicial en procés... Proveu-ho més tard.",
 "Go directly to your " => "Vés directament a",
 "personal settings" => "arranjament personal",
 "Encryption" => "Xifrat",
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
index 622942b052a0861454d87f4ea8e9c2603e3d6cb0..656930514f0d689a16ed3c088afe266fbea114bd 100644
--- a/apps/files_external/3rdparty/smb4php/smb.php
+++ b/apps/files_external/3rdparty/smb4php/smb.php
@@ -20,6 +20,7 @@
 # GNU General Public License for more details.
 #
 # Addition 17/12/2012 Frank Karlitschek (frank@owncloud.org)
+# Addition 17/03/2014 Robin McCorkell (rmccorkell@karoshi.org.uk)
 # On the official website http://www.phpclasses.org/smb4php the
 # license is listed as LGPL so we assume that this is
 # dual-licensed GPL/LGPL
@@ -238,17 +239,10 @@ class smb {
 					trigger_error ("url_stat(): list failed for host '{$pu['host']}'", E_USER_WARNING);
 				break;
 			case 'share':
-				if ($o = smb::look ($pu)) {
-					$found = FALSE;
-					$lshare = strtolower ($pu['share']);  # fix by Eric Leung
-					foreach ($o['disk'] as $s) if ($lshare == strtolower($s)) {
-						$found = TRUE;
-						$stat = stat ("/tmp");
-						break;
-					}
-					if (! $found)
-						trigger_error ("url_stat(): disk resource '{$lshare}' not found in '{$pu['host']}'", E_USER_WARNING);
-				}
+				if (smb::execute("ls", $pu))
+					$stat = stat ("/tmp");
+				else
+					trigger_error ("url_stat(): disk resource '{$pu['share']}' not found in '{$pu['host']}'", E_USER_WARNING);
 				break;
 			case 'path':
 				if ($o = smb::execute ('dir "'.$pu['path'].'"', $pu)) {
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index 40a1ffc9b5c29bf376e96648d3e1ea0c5175f4d3..3e72204629685bcdf8aebff503abbafc398a018f 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Concedeix accés",
 "Please provide a valid Dropbox app key and secret." => "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
 "Error configuring Google Drive storage" => "Error en configurar l'emmagatzemament Google Drive",
+"Saved" => "Desat",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<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.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>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.",
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Avís:</b>El suport Curl de PHP no està activat o instal·lat. No es pot muntar ownCloud / WebDAV o GoogleDrive. Demaneu a l'administrador que l'instal·li.",
@@ -21,6 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Usuaris",
 "Delete" => "Esborra",
 "Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
+"Allow users to mount the following external storage" => "Permet als usuaris muntar els dispositius externs següents",
 "SSL root certificates" => "Certificats SSL root",
 "Import Root Certificate" => "Importa certificat root"
 );
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index dafe722bc2d8091ff8a000c7c9b7e0e43359d7c5..2f7bbd0c4a3ce6d41d987282aed4e16c4305da4e 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Povolit přístup",
 "Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
 "Error configuring Google Drive storage" => "Chyba při nastavení úložiště Google Drive",
+"Saved" => "Uloženo",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Varování:</b> podpora FTP v PHP není povolena nebo není nainstalována. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje.",
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Varování:</b> podpora CURL v PHP není povolena nebo není nainstalována. Není možné připojení oddílů ownCloud, WebDAV, či GoogleDrive. Prosím požádejte svého správce systému ať ji nainstaluje.",
@@ -21,6 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Uživatelé",
 "Delete" => "Smazat",
 "Enable User External Storage" => "Zapnout externí uživatelské úložiště",
+"Allow users to mount the following external storage" => "Povolit uživatelů připojit externí úložiště",
 "SSL root certificates" => "Kořenové certifikáty SSL",
 "Import Root Certificate" => "Importovat kořenového certifikátu"
 );
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 2767076eefa6c605cdd5f62a591efe20d7167382..2c8828c4d5111f8e4868810f02e89ef46f92fafe 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -28,6 +28,9 @@ class OC_Mount_Config {
 	const MOUNT_TYPE_GROUP = 'group';
 	const MOUNT_TYPE_USER = 'user';
 
+	// whether to skip backend test (for unit tests, as this static class is not mockable)
+	public static $skipTest = false;
+
 	/**
 	* Get details on each of the external storage backends, used for the mount config UI
 	* If a custom UI is needed, add the key 'custom' and a javascript file with that name will be loaded
@@ -275,6 +278,9 @@ class OC_Mount_Config {
 	}
 
 	private static function getBackendStatus($class, $options) {
+		if (self::$skipTest) {
+			return true;
+		}
 		foreach ($options as &$option) {
 			$option = str_replace('$user', OCP\User::getUser(), $option);
 		}
@@ -321,7 +327,7 @@ class OC_Mount_Config {
 			// Verify that the mount point applies for the current user
 			// Prevent non-admin users from mounting local storage and other disabled backends
 			$allowed_backends = self::getPersonalBackends();
-			if ($applicable != OCP\User::getUser() || !in_array($class, $allowed_backends)) {
+			if ($applicable != OCP\User::getUser() || !isset($allowed_backends[$class])) {
 				return false;
 			}
 			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 24ebcf51346b8a90ca26327e0663b2586069737f..a22c7424c69135825fc1d15313a05a6d99553dbb 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -34,6 +34,66 @@ class Test_Mount_Config_Dummy_Storage {
  * Class Test_Mount_Config
  */
 class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
+
+	private $dataDir;
+	private $userHome;
+	private $oldAllowedBackends;
+	private $allBackends;
+
+	public function setUp() {
+		\OC_User::setUserId('test');
+		$this->userHome = \OC_User::getHome('test');
+		mkdir($this->userHome);
+
+		$this->dataDir = \OC_Config::getValue(
+			'datadirectory',
+			\OC::$SERVERROOT . '/data/'
+		);
+		$this->oldAllowedBackends = OCP\Config::getAppValue(
+			'files_external',
+			'user_mounting_backends',
+			''
+		);
+		$this->allBackends = OC_Mount_Config::getBackends();
+		OCP\Config::setAppValue(
+			'files_external',
+			'user_mounting_backends',
+			implode(',', array_keys($this->allBackends))
+		);
+
+		OC_Mount_Config::$skipTest = true;
+	}
+
+	public function tearDown() {
+		OC_Mount_Config::$skipTest = false;
+
+		@unlink($this->dataDir . '/mount.json');
+		@unlink($this->userHome . '/mount.json');
+		rmdir($this->userHome);
+
+		OCP\Config::setAppValue(
+			'files_external',
+			'user_mounting_backends',
+			$this->oldAllowedBackends
+		);
+	}
+
+	/**
+	 * Reads the global config, for checking
+	 */
+	private function readGlobalConfig() {
+		$configFile = $this->dataDir . '/mount.json';
+		return json_decode(file_get_contents($configFile), true);
+	}
+
+	/**
+	 * Reads the user config, for checking
+	 */
+	private function readUserConfig() {
+		$configFile = $this->userHome . '/mount.json';
+		return json_decode(file_get_contents($configFile), true);
+	}
+
 	/**
 	 * Test mount point validation
 	 */
@@ -42,35 +102,88 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		$mountType = 'user';
 		$applicable = 'all';
 		$isPersonal = false;
-		$this->assertEquals(false, OC_Mount_Config::addMountPoint('', $storageClass, array(), $mountType, $applicable, $isPersonal));
-		$this->assertEquals(false, OC_Mount_Config::addMountPoint('/', $storageClass, array(), $mountType, $applicable, $isPersonal));
-		$this->assertEquals(false, OC_Mount_Config::addMountPoint('Shared', $storageClass, array(), $mountType, $applicable, $isPersonal));
-		$this->assertEquals(false, OC_Mount_Config::addMountPoint('/Shared', $storageClass, array(), $mountType, $applicable, $isPersonal));
+		$this->assertFalse(OC_Mount_Config::addMountPoint('', $storageClass, array(), $mountType, $applicable, $isPersonal));
+		$this->assertFalse(OC_Mount_Config::addMountPoint('/', $storageClass, array(), $mountType, $applicable, $isPersonal));
+		$this->assertFalse(OC_Mount_Config::addMountPoint('Shared', $storageClass, array(), $mountType, $applicable, $isPersonal));
+		$this->assertFalse(OC_Mount_Config::addMountPoint('/Shared', $storageClass, array(), $mountType, $applicable, $isPersonal));
 
 	}
 
+	/**
+	 * Test adding a global mount point
+	 */
+	public function testAddGlobalMountPoint() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_GLOBAL;
+		$applicable = 'all';
+		$isPersonal = false;
+
+		$this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
+
+		$config = $this->readGlobalConfig();
+		$this->assertEquals(1, count($config));
+		$this->assertTrue(isset($config[$mountType]));
+		$this->assertTrue(isset($config[$mountType][$applicable]));
+		$this->assertTrue(isset($config[$mountType][$applicable]['/$user/files/ext']));
+		$this->assertEquals(
+			'\OC\Files\Storage\SFTP',
+			$config[$mountType][$applicable]['/$user/files/ext']['class']
+		);
+	}
+
+	/**
+	 * Test adding a personal mount point
+	 */
 	public function testAddMountPointSingleUser() {
-		\OC_User::setUserId('test');
-		$mountType = 'user';
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$applicable = 'test';
+		$isPersonal = true;
+
+		$this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
+
+		$config = $this->readUserConfig();
+		$this->assertEquals(1, count($config));
+		$this->assertTrue(isset($config[$mountType]));
+		$this->assertTrue(isset($config[$mountType][$applicable]));
+		$this->assertTrue(isset($config[$mountType][$applicable]['/test/files/ext']));
+		$this->assertEquals(
+			'\OC\Files\Storage\SFTP',
+			$config[$mountType][$applicable]['/test/files/ext']['class']
+		);
+	}
+
+	/**
+	 * Test adding a personal mount point using disallowed backend
+	 */
+	public function testAddDisallowedBackendMountPointSingleUser() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
 		$applicable = 'test';
 		$isPersonal = true;
+
 		// local
-		$this->assertEquals(false, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\storage\local', array(), $mountType, $applicable, $isPersonal));
-		// non-local
-		// FIXME: can't test this yet as the class (write operation) is not mockable
-		// $this->assertEquals(true, OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
+		$this->assertFalse(OC_Mount_Config::addMountPoint('/ext', '\OC\Files\storage\local', array(), $mountType, $applicable, $isPersonal));
 
+		unset($this->allBackends['\OC\Files\Storage\SFTP']);
+		OCP\Config::setAppValue(
+			'files_external',
+			'user_mounting_backends',
+			implode(',', array_keys($this->allBackends))
+		);
+
+		// non-local but forbidden
+		$this->assertFalse(OC_Mount_Config::addMountPoint('/ext', '\OC\Files\Storage\SFTP', array(), $mountType, $applicable, $isPersonal));
+
+		$this->assertFalse(file_exists($this->userHome . '/mount.json'));
 	}
 
+	/**
+	 * Test adding a mount point with an non-existant backend
+	 */
 	public function testAddMountPointUnexistClass() {
-		\OC_User::setUserId('test');
 		$storageClass = 'Unexist_Storage';
-		$mountType = 'user';
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
 		$applicable = 'test';
-		$isPersonal = true;
-		// local
-		// non-local
-		$this->assertEquals(false, OC_Mount_Config::addMountPoint('/ext', $storageClass, array(), $mountType, $applicable, $isPersonal));
+		$isPersonal = false;
+		$this->assertFalse(OC_Mount_Config::addMountPoint('/ext', $storageClass, array(), $mountType, $applicable, $isPersonal));
 
 	}
 }
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 7068626b7ef23f0134feaa1edd4fc3da705a8c5d..6432219650bb36312d5de110a9cf333430d96c40 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "sharing is disabled" => "s'ha desactivat la compartició",
 "For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.",
 "shared by %s" => "compartit per %s",
+"Download %s" => "Baixa %s",
 "Direct link" => "Enllaç directe"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index e0a3c27fb4cab270070d7eb57a3bca2b80cf9dd1..5d50ff413168e853dc9fa3b7be2d4c7ee8ff17bb 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "sharing is disabled" => "sdílení je zakázané",
 "For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.",
 "shared by %s" => "sdíleno %s",
+"Download %s" => "Stáhnout %s",
 "Direct link" => "Přímý odkaz"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 0a012b78e9169365fa670a388822b78b94acad21..940c6ea8b6608735044f16b0acffab1749e9ace7 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -33,12 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Desa",
 "Test Configuration" => "Comprovació de la configuració",
 "Help" => "Ajuda",
+"Groups meeting these criteria are available in %s:" => "Els grups que compleixen aquests criteris estan disponibles a %s:",
 "only those object classes:" => "només aquestes classes d'objecte:",
 "only from those groups:" => "només d'aquests grups",
 "Edit raw filter instead" => "Edita filtre raw",
 "Raw LDAP filter" => "Filtre raw LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
 "groups found" => "grups trobats",
+"Users login with this attribute:" => "Usuaris acreditats amb aquest atribut:",
 "LDAP Username:" => "Nom d'usuari LDAP:",
 "LDAP Email Address:" => "Adreça de correu electrònic LDAP:",
 "Other Attributes:" => "Altres atributs:",
@@ -53,6 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
 "One Base DN per line" => "Una DN Base per línia",
 "You can specify Base DN for users and groups in the Advanced tab" => "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
+"Limit %s access to users meeting these criteria:" => "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
 "users found" => "usuaris trobats",
 "Back" => "Enrera",
@@ -85,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Una DN Base de Grup per línia",
 "Group Search Attributes" => "Atributs de cerca de grup",
 "Group-Member association" => "Associació membres-grup",
+"Nested Groups" => "Grups imbricats",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quan està activat, els grups que contenen grups estan permesos. (Només funciona si l'atribut del grup membre conté DNs.)",
 "Special Attributes" => "Atributs especials",
 "Quota Field" => "Camp de quota",
 "Quota Default" => "Quota per defecte",
diff --git a/core/ajax/update.php b/core/ajax/update.php
index d6af84e95b1126377a248754df903b6af5239de4..2a0cbb2036d6e59be5121e57abfc60942a169a6e 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -16,15 +16,6 @@ if (OC::checkUpgrade(false)) {
 	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Updated database'));
 	});
-	$updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updating filecache, this may take really long...'));
-	});
-	$updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated filecache'));
-	});
-	$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('... %d%% done ...', array('percent' => $out)));
-	});
 	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) {
 		$eventSource->send('failure', $message);
 		$eventSource->close();
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 6e5681b26df3a71fdce9c08b70861253783ff13c..cfccfb5d2f0363928c3d5cb5242c09c6e47b9c61 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -59,15 +59,6 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
 				$output->writeln('<info>Updated database</info>');
 			});
-			$updater->listen('\OC\Updater', 'filecacheStart', function () use($output) {
-				$output->writeln('<info>Updating filecache, this may take really long...</info>');
-			});
-			$updater->listen('\OC\Updater', 'filecacheDone', function () use($output) {
-				$output->writeln('<info>Updated filecache</info>');
-			});
-			$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use($output) {
-				$output->writeln('... ' . $out . '% done ...');
-			});
 
 			$updater->listen('\OC\Updater', 'failure', function ($message) use($output) {
 				$output->writeln($message);
diff --git a/core/css/apps.css b/core/css/apps.css
index 58f2759f69a2252dd551b3a2c12102e50a618070..0e6a080c9cd7ebe1dfd3cf216d85952bc8f9aabe 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -189,7 +189,7 @@
 	display: block;
 	/* restrict height of settings and make scrollable */
 	max-height: 300px;
-	overflow-y: scroll;
+	overflow-y: auto;
 }
 
 .settings-button {
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 76dc1d9c46f4e89badbd670902c1d108925ad771..498086b28058a4c235ea84870fcc7309d0fe8e40 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -59,6 +59,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(vybráno vše)",
 "({count} selected)" => "(vybráno {count})",
 "Error loading file exists template" => "Chyba při nahrávání šablony existence souboru",
+"Very weak password" => "Velmi slabé heslo",
+"Weak password" => "Slabé heslo",
+"So-so password" => "Středně silné heslo",
+"Good password" => "Dobré heslo",
+"Strong password" => "Silné heslo",
 "Shared" => "Sdílené",
 "Share" => "Sdílet",
 "Error" => "Chyba",
@@ -143,6 +148,7 @@ $TRANSLATIONS = array(
 "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=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
+"Storage & database" => "Úložiště & databáze",
 "Data folder" => "Složka s daty",
 "Configure the database" => "Nastavit databázi",
 "will be used" => "bude použito",
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index ba94d75385270e57dfd270987300bb59947691a1..f6d7bc666cc0cb431d0a1135650fd6ff2869e364 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 18:50+0000\n"
 "Last-Translator: I Robot\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.po b/l10n/ar/files.po
index ef9dee2fe29584a46a6ace73b882d554ddde0587..bab63e292ea24afad1a3f4314206fa9727e0cc5f 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 21:00+0000\n"
 "Last-Translator: I Robot\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_encryption.po b/l10n/ar/files_encryption.po
index 8862dd4ff5a89cca9d33e8514397acda94948cda..938f63bc23ac902a9e865f5e0f6158ad8563cef9 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# m.shehab <shehab.mahmood@gmail.com>, 2014
 # suliman <291101251@std.qu.edu.sa>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-19 05:50+0000\n"
+"Last-Translator: m.shehab <shehab.mahmood@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,7 +103,7 @@ msgstr "بدأ التشفير... من الممكن ان ياخذ بعض الوق
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا"
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index f093a8eab0f235e26bc84708b74bb66dc35ba22a..a78e73ae96ab160a06e4136d73e0e74bc1e36229 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 08:40+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير."
 
@@ -207,9 +207,9 @@ msgstr ""
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "خطأ في قواعد البيانات : \"%s\""
@@ -218,9 +218,9 @@ msgstr "خطأ في قواعد البيانات : \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "الأمر المخالف كان : \"%s\""
@@ -256,7 +256,7 @@ msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام Oracl
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s"
 
-#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
 msgid "PostgreSQL username and/or password not valid"
 msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة"
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 1beb1ba49f427e57808757cbfd64c6287e456aba..a3d00d9963ad59504cab88849c6666f4c876bbc8 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 18:50+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "تم ارسال البريد الالكتروني"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:282
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
 msgid "Encryption"
 msgstr "التشفير"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:319
 msgid "Authentication method"
 msgstr ""
 
@@ -213,31 +213,31 @@ msgstr "حدث"
 msgid "Updated"
 msgstr "تم التحديث بنجاح"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "اختر صورة الملف الشخصي "
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr ""
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr ""
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr ""
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت."
 
@@ -334,18 +334,18 @@ msgstr ""
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "تحذير أمان"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "انت تستخدم %s عن طريق HTTP . نحن نقترح باصرار ان تهيء الخادم ليتمكن من الوصول عن طريق HTTPS."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -354,68 +354,68 @@ msgid ""
 "root."
 msgstr "مجلد data و ملفاتك يمكن الوصول لها عن طريق الانترنت. ملف .htaccess لا يمكن تشغيلة. نحن نقترح باصرار ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. "
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "تحذير في التنصيب"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 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:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "يرجى التحقق <a href=\"%s\">دليل التثبيت</a>."
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "الموديل 'fileinfo' مفقود"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 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:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "اصدار PHP الخاص بك قديم"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "اصدار PHP الخاص بك قديم. نحن نقترح لك باصرار ان يتم ترقية الاصدار الى  5.3.8 او احدث بسبب ان الاصدارات القديمة معروفة انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صحيحة."
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "اللغه لا تعمل"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "لا يمكن تعيين لغة النظام الى احد اللغات التي تدعم UTF-8."
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "هذا يعني انه من الممكن ان يكون هناك مشكلة في بعض الاحرف في اسم الملف."
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "الاتصال بالانترنت لا يعمل"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -424,162 +424,162 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات"
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "مجدول"
 
-#: templates/admin.php:163
+#: templates/admin.php:167
 msgid "Execute one task with each page loaded"
 msgstr "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها"
 
-#: templates/admin.php:171
+#: templates/admin.php:175
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "الملف cron.php تم تسجيله فى خدمه webcron  لاستدعاء الملف cron.php كل  15 دقيقه"
 
-#: templates/admin.php:179
+#: templates/admin.php:183
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "استخدم نظام خدمة cron لـ استدعاء ملف cron.php كل 15 دقيقة "
 
-#: templates/admin.php:184
+#: templates/admin.php:188
 msgid "Sharing"
 msgstr "مشاركة"
 
-#: templates/admin.php:190
+#: templates/admin.php:194
 msgid "Enable Share API"
 msgstr "السماح بالمشاركة عن طريق الAPI "
 
-#: templates/admin.php:191
+#: templates/admin.php:195
 msgid "Allow apps to use the Share API"
 msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI"
 
-#: templates/admin.php:198
+#: templates/admin.php:202
 msgid "Allow links"
 msgstr "السماح بالعناوين"
 
-#: templates/admin.php:199
+#: templates/admin.php:203
 msgid "Allow users to share items to the public with links"
 msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
 
-#: templates/admin.php:207
+#: templates/admin.php:210
 msgid "Allow public uploads"
 msgstr "السماح بالرفع للعامة "
 
-#: templates/admin.php:208
+#: templates/admin.php:211
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام "
 
-#: templates/admin.php:216
+#: templates/admin.php:218
 msgid "Allow resharing"
 msgstr "السماح بإعادة المشاركة "
 
-#: templates/admin.php:217
+#: templates/admin.php:219
 msgid "Allow users to share items shared with them again"
 msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
 
-#: templates/admin.php:224
+#: templates/admin.php:226
 msgid "Allow users to share with anyone"
 msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد  "
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 msgid "Allow users to only share with users in their groups"
 msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
 
-#: templates/admin.php:234
+#: templates/admin.php:236
 msgid "Allow mail notification"
 msgstr "السماح بتنبيهات البريد الالكتروني."
 
-#: templates/admin.php:235
+#: templates/admin.php:237
 msgid "Allow user to send mail notification for shared files"
 msgstr "السماح للمستخدم الى ارسال تنبيه البريد الالكتروني للملفات المشتركة "
 
-#: templates/admin.php:242
+#: templates/admin.php:244
 msgid "Security"
 msgstr "حماية"
 
-#: templates/admin.php:255
+#: templates/admin.php:257
 msgid "Enforce HTTPS"
 msgstr "فرض HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:259
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر"
 
-#: templates/admin.php:263
+#: templates/admin.php:265
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement."
 
-#: templates/admin.php:275
+#: templates/admin.php:277
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:277
+#: templates/admin.php:279
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:310
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:330
+#: templates/admin.php:332
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:336
 msgid "Server address"
 msgstr "عنوان الخادم"
 
-#: templates/admin.php:338
+#: templates/admin.php:340
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:343
+#: templates/admin.php:345
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:346
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:349
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:353
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:352
+#: templates/admin.php:354
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:357
+#: templates/admin.php:359
 msgid "Log"
 msgstr "سجل"
 
-#: templates/admin.php:358
+#: templates/admin.php:360
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:390
+#: templates/admin.php:392
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:391
+#: templates/admin.php:393
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:399 templates/personal.php:181
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:403 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 87aad0de4d1700a08c0ee5850b6e81e7739180d6..e3a5525e8423c8fbe33735f848ff75810eb50ef6 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 06:50+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index ebf7dc63f851d5531dbe16f9fc53a7bb1e31d794..9931cfa3cebfe969746dda60bd9fb69078d5cd7f 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -6,13 +6,14 @@
 # rogerc, 2013-2014
 # jmontane <joan@montane.cat>, 2013
 # Josep Tomàs <jtomas.binsoft@gmail.com>, 2013
+# mickymadsystems <micky@madsystems.cat>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 08:40+0000\n"
+"Last-Translator: mickymadsystems <micky@madsystems.cat>\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"
@@ -37,7 +38,7 @@ msgstr "El nom del fitxer no pot ser buit."
 #: ajax/newfile.php:62
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" no es un fitxer vàlid."
 
 #: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
 msgid ""
@@ -48,7 +49,7 @@ msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no
 #: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "La carpeta de destí s'ha mogut o eliminat."
 
 #: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
@@ -152,12 +153,12 @@ msgstr "No es pot pujar {filename} perquè és una carpeta o té 0 bytes"
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Mida total del fitxer {size1} excedeix el límit de pujada {size2}"
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}"
 
 #: js/file-upload.js:338
 msgid "Upload cancelled."
@@ -252,7 +253,7 @@ msgstr[1] "Pujant %n fitxers"
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" no es un fitxer vàlid."
 
 #: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 87e5747a994de7983419714e10210f728a18a4ea..3865dfb3134226ae6bc6b931aad8a7ec0ca7d5d9 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc, 2013
+# rogerc, 2013-2014
 # Jordi Vilalta Prat <jvprat@jvprat.com>, 2013
 # Josep Tomàs <jtomas.binsoft@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 08: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"
@@ -104,7 +104,7 @@ msgstr "La encriptació inicial ha començat... Pot trigar una estona, espereu."
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "encriptació inicial en procés... Proveu-ho més tard."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 91d69f2f2e6671f5a7afea8f494a4dd92eb79ff5..711c32d3266f95a6f3b8b5015fa7b87ae0fb1db6 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2014
 # rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 09:02+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"
@@ -40,7 +41,7 @@ msgstr "Error en configurar l'emmagatzemament Google Drive"
 
 #: js/settings.js:313 js/settings.js:320
 msgid "Saved"
-msgstr ""
+msgstr "Desat"
 
 #: lib/config.php:512
 msgid ""
@@ -117,7 +118,7 @@ msgstr "Habilita l'emmagatzemament extern d'usuari"
 
 #: templates/settings.php:130
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Permet als usuaris muntar els dispositius externs següents"
 
 #: templates/settings.php:147
 msgid "SSL root certificates"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 1a93090cfe165603e432667828428239dd6d38bf..9452db004bd11ac9e033e6afa11b84b621e74d30 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc, 2013
+# rogerc, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 08:52+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"
@@ -66,7 +66,7 @@ msgstr "compartit per %s"
 #: templates/public.php:44
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Baixa %s"
 
 #: templates/public.php:48
 msgid "Direct link"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index ce2e2043a18fc39a155d3f1b531ab0733d3b5beb..be843190732f7fc453ec28556329c02ce00d3369 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc, 2013
+# rogerc, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 09:02+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"
@@ -158,7 +158,7 @@ msgstr "El testimoni ha expirat. Torneu a carregar la pàgina."
 
 #: private/json.php:75
 msgid "Unknown user"
-msgstr ""
+msgstr "Usuari desconegut"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -193,23 +193,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Heu d'escriure un compte existent o el d'administrador."
 
 #: private/setup/mysql.php:12
 msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "El nom d'usuari i/o la contrasenya de MySQL/MariaDB no són vàlids"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
@@ -218,9 +218,9 @@ msgstr "Error DB: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "L'ordre en conflicte és: \"%s\""
@@ -228,20 +228,20 @@ msgstr "L'ordre en conflicte és: \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "L'usuari MySQL/MariaDB '%s'@'localhost' ja existeix."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Esborreu aquest usuari de MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "L'usuari MySQL/MariaDB '%s'@'%%' ja existeix"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Esborreu aquest usuari de MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -256,7 +256,7 @@ msgstr "Nom d'usuari i/o contrasenya Oracle no vàlids"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
 
-#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vàlids"
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index df889193c623368db00a60e55542173e0cac444b..caae9ab09e8fb69c9dfd1494f8e163ebc69f1fc5 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 14:20+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 09:10+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"
@@ -22,24 +22,24 @@ msgstr ""
 #: admin/controller.php:66
 #, php-format
 msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "El valor proporcionat no és vàlid per %s"
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Desat"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr ""
+msgstr "prova l'arranjament del correu"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Si rebeu aquest correu sembla que l'arranjament del correu és correcte."
 
 #: admin/controller.php:94
 msgid ""
 "A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "Hi ha hagut un problema en enviar el correu. Comproveu-ne l'arranjament."
 
 #: admin/controller.php:99
 msgid "Email sent"
@@ -47,19 +47,19 @@ msgstr "El correu electrónic s'ha enviat"
 
 #: admin/controller.php:101
 msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "Heu d'establir un nom d'usuari abans de poder enviar correus de prova."
 
-#: admin/controller.php:116 templates/admin.php:284
+#: admin/controller.php:116 templates/admin.php:282
 msgid "Send mode"
-msgstr ""
+msgstr "Mode d'enviament"
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
 msgid "Encryption"
 msgstr "Xifrat"
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:319
 msgid "Authentication method"
-msgstr ""
+msgstr "Mètode d'autenticació"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
@@ -159,7 +159,7 @@ msgstr "No es pot canviar la contrasenya"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "Enviant..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -167,7 +167,7 @@ msgstr "Documentació d'usuari"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Documentació d'administrador"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -320,19 +320,19 @@ msgstr "Inici de sessió"
 
 #: templates/admin.php:18
 msgid "Plain"
-msgstr ""
+msgstr "Pla"
 
 #: templates/admin.php:19
 msgid "NT LAN Manager"
-msgstr ""
+msgstr "Gestor NT LAN"
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
@@ -462,124 +462,124 @@ msgstr "Permet enllaços"
 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:211
+#: templates/admin.php:210
 msgid "Allow public uploads"
 msgstr "Permet pujada pública"
 
-#: templates/admin.php:212
+#: templates/admin.php:211
 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:220
+#: templates/admin.php:218
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:221
+#: templates/admin.php:219
 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:228
+#: templates/admin.php:226
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:231
+#: templates/admin.php:229
 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:238
+#: templates/admin.php:236
 msgid "Allow mail notification"
 msgstr "Permet notificacions per correu electrónic"
 
-#: templates/admin.php:239
+#: templates/admin.php:237
 msgid "Allow user to send mail notification for shared files"
 msgstr "Permet a l'usuari enviar notificacions de fitxers compartits per correu "
 
-#: templates/admin.php:246
+#: templates/admin.php:244
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:259
+#: templates/admin.php:257
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:261
+#: templates/admin.php:259
 #, 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:267
+#: templates/admin.php:265
 #, php-format
 msgid ""
 "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:279
+#: templates/admin.php:277
 msgid "Email Server"
-msgstr ""
+msgstr "Servidor de correu"
 
-#: templates/admin.php:281
+#: templates/admin.php:279
 msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "S'usa per enviar notificacions."
 
-#: templates/admin.php:312
+#: templates/admin.php:310
 msgid "From address"
-msgstr ""
+msgstr "Des de l'adreça"
 
-#: templates/admin.php:334
+#: templates/admin.php:332
 msgid "Authentication required"
-msgstr ""
+msgstr "Es requereix autenticació"
 
-#: templates/admin.php:338
+#: templates/admin.php:336
 msgid "Server address"
 msgstr "Adreça del servidor"
 
-#: templates/admin.php:342
+#: templates/admin.php:340
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:347
+#: templates/admin.php:345
 msgid "Credentials"
 msgstr "Credencials"
 
-#: templates/admin.php:348
+#: templates/admin.php:346
 msgid "SMTP Username"
-msgstr ""
+msgstr "Nom d'usuari SMTP"
 
-#: templates/admin.php:351
+#: templates/admin.php:349
 msgid "SMTP Password"
-msgstr ""
+msgstr "Contrasenya SMTP"
 
-#: templates/admin.php:355
+#: templates/admin.php:353
 msgid "Test email settings"
-msgstr ""
+msgstr "Prova l'arranjament del correu"
 
-#: templates/admin.php:356
+#: templates/admin.php:354
 msgid "Send email"
-msgstr ""
+msgstr "Envia correu"
 
-#: templates/admin.php:361
+#: templates/admin.php:359
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:362
+#: templates/admin.php:360
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:394
+#: templates/admin.php:392
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:395
+#: templates/admin.php:393
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:399 templates/personal.php:181
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:403 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -603,7 +603,7 @@ msgstr "Seleccioneu una aplicació"
 
 #: templates/apps.php:42
 msgid "Documentation:"
-msgstr ""
+msgstr "Documentació:"
 
 #: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
@@ -611,7 +611,7 @@ msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
 #: templates/apps.php:50
 msgid "See application website"
-msgstr ""
+msgstr "Mostra la web de l'aplicació"
 
 #: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -690,7 +690,7 @@ msgstr "Correu electrònic"
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
-msgstr ""
+msgstr "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions"
 
 #: templates/personal.php:96
 msgid "Profile picture"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 0fdcd69df36d5af1a02bd5175c2d362a32260a8c..ce1cd4df022a95eda00009ef5852a4822ef244a3 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc, 2013
+# rogerc, 2013-2014
 # rogerc, 2013
 # victek, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 08:52+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"
@@ -166,7 +166,7 @@ msgstr "Ajuda"
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
 msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Els grups que compleixen aquests criteris estan disponibles a %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -202,7 +202,7 @@ msgstr "grups trobats"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Usuaris acreditats amb aquest atribut:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -270,7 +270,7 @@ msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
 #: templates/part.wizard-userfilter.php:4
 #, php-format
 msgid "Limit %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Limita l'accés a %s usuaris que compleixin amb aquest criteri:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -414,13 +414,13 @@ msgstr "Associació membres-grup"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Grups imbricats"
 
 #: templates/settings.php:39
 msgid ""
 "When switched on, groups that contain groups are supported. (Only works if "
 "the group member attribute contains DNs.)"
-msgstr ""
+msgstr "Quan està activat, els grups que contenen grups estan permesos. (Només funciona si l'atribut del grup membre conté DNs.)"
 
 #: templates/settings.php:41
 msgid "Special Attributes"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index ed065c2dee65d286accda66a1a561f5c9fd52aea..08ca5c28cfcc7757dd8008ff6d2e655d504fb2a0 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -8,15 +8,16 @@
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013
 # Martin <fireball@atlas.cz>, 2013
+# m23 <black23@gmail.com>, 2014
 # pstast <petr@stastny.eu>, 2013-2014
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 21:30+0000\n"
+"Last-Translator: m23 <black23@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -281,23 +282,23 @@ msgstr "Chyba při nahrávání šablony existence souboru"
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Velmi slabé heslo"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Slabé heslo"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Středně silné heslo"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Dobré heslo"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Silné heslo"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -674,7 +675,7 @@ msgstr "Vytvořit <strong>účet správce</strong>"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr ""
+msgstr "Úložiště & databáze"
 
 #: templates/installation.php:77
 msgid "Data folder"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index eb66b8269fd21e880758dc5512ccd2aef69829e2..fbe509b5e995d8ed313e80dc62c2ebe14d1406da 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -8,15 +8,16 @@
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013-2014
 # cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
+# m23 <black23@gmail.com>, 2014
 # pstast <petr@stastny.eu>, 2013
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 20:40+0000\n"
+"Last-Translator: m23 <black23@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr "Název souboru nemůže být prázdný řetězec."
 #: ajax/newfile.php:62
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" je neplatným názvem souboru."
 
 #: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
 msgid ""
@@ -52,7 +53,7 @@ msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' n
 #: ajax/newfile.php:75 ajax/newfolder.php:34 ajax/upload.php:137
 #: lib/app.php:65
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Cílová složka byla přesunuta nebo smazána."
 
 #: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
@@ -156,12 +157,12 @@ msgstr "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má
 
 #: js/file-upload.js:258
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}"
 
 #: js/file-upload.js:268
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}"
 
 #: js/file-upload.js:338
 msgid "Upload cancelled."
@@ -259,7 +260,7 @@ msgstr[2] "Nahrávám %n souborů"
 
 #: js/files.js:96
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" je neplatným názvem souboru."
 
 #: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index ff6afc9625c7e2e50f8333fbcf8ec5807b244ef1..349b37ace7683eea61de38de88a945a5ab4c4869 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# m23 <black23@gmail.com>, 2014
 # pstast <petr@stastny.eu>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 21:30+0000\n"
+"Last-Translator: m23 <black23@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +41,7 @@ msgstr "Chyba při nastavení úložiště Google Drive"
 
 #: js/settings.js:313 js/settings.js:320
 msgid "Saved"
-msgstr ""
+msgstr "Uloženo"
 
 #: lib/config.php:512
 msgid ""
@@ -117,7 +118,7 @@ msgstr "Zapnout externí uživatelské úložiště"
 
 #: templates/settings.php:130
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Povolit uživatelů připojit externí úložiště"
 
 #: templates/settings.php:147
 msgid "SSL root certificates"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 19ed3038393a2b788afa966b6999de448f9764c1..ce64f200f2fce414fb763c03706616b74eec86b6 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # liska_, 2013
+# m23 <black23@gmail.com>, 2014
 # pstast <petr@stastny.eu>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 12:24+0000\n"
+"Last-Translator: m23 <black23@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +68,7 @@ msgstr "sdíleno %s"
 #: templates/public.php:44
 #, php-format
 msgid "Download %s"
-msgstr ""
+msgstr "Stáhnout %s"
 
 #: templates/public.php:48
 msgid "Direct link"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 26cf2c71dd01fcd7b3da751c0fd52a6b1ac6f18c..7d2e44fc8d4830390dd222136c7cef588efacbc1 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -5,15 +5,16 @@
 # Translators:
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013
+# m23 <black23@gmail.com>, 2014
 # pstast <petr@stastny.eu>, 2013
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 21:30+0000\n"
+"Last-Translator: m23 <black23@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,7 +162,7 @@ msgstr "Token vypršel. Obnovte prosím stránku."
 
 #: private/json.php:75
 msgid "Unknown user"
-msgstr ""
+msgstr "Neznámý uživatel"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -196,23 +197,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Uživatelské jméno či heslo MSSQL není platné: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadat existující účet či správce."
 
 #: private/setup/mysql.php:12
 msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "MySQL/MariaDB uživatelské jméno a/nebo heslo je neplatné"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba databáze: \"%s\""
@@ -221,9 +222,9 @@ msgstr "Chyba databáze: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Příslušný příkaz byl: \"%s\""
@@ -231,20 +232,20 @@ msgstr "Příslušný příkaz byl: \"%s\""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL/MariaDB uživatel '%s'@'localhost' již existuje."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Zahodit uživatele z MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB uživatel '%s'@'%%' již existuje"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Zahodit uživatele z MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -259,7 +260,7 @@ msgstr "Uživatelské jméno či heslo Oracle není platné"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Příslušný příkaz byl: \"%s\", jméno: %s, heslo: %s"
 
-#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Uživatelské jméno či heslo PostgreSQL není platné"
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 203ca842ddecb94a50ecca98cb2d6afbf09b59db..459232cb5a883753e57d8bd1561d6ad1f5ecf527 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -7,15 +7,16 @@
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013
 # cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
+# m23 <black23@gmail.com>, 2014
 # pstast <petr@stastny.eu>, 2013-2014
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-12 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-19 01:55-0400\n"
+"PO-Revision-Date: 2014-03-18 21:40+0000\n"
+"Last-Translator: m23 <black23@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Uloženo"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -53,17 +54,17 @@ msgstr "E-mail odeslán"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:280
+#: admin/controller.php:116 templates/admin.php:282
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:293 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: admin/controller.php:120 templates/admin.php:317
+#: admin/controller.php:120 templates/admin.php:319
 msgid "Authentication method"
-msgstr ""
+msgstr "Metoda autentifikace"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
@@ -163,7 +164,7 @@ msgstr "Změna hesla se nezdařila"
 
 #: js/admin.js:73
 msgid "Sending..."
-msgstr ""
+msgstr "Odesílání..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -171,7 +172,7 @@ msgstr "Uživatelská dokumentace"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Dokumentace pro administrátory"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
@@ -217,31 +218,31 @@ msgstr "Aktualizovat"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Vyberte profilový obrázek"
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
-msgstr ""
+msgstr "Velmi slabé heslo"
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
-msgstr ""
+msgstr "Slabé heslo"
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
-msgstr ""
+msgstr "Středně silné heslo"
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
-msgstr ""
+msgstr "Dobré heslo"
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
-msgstr ""
+msgstr "Silné heslo"
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu."
 
@@ -332,24 +333,24 @@ msgstr ""
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: templates/admin.php:43 templates/admin.php:57
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Bezpečnostní upozornění"
 
-#: templates/admin.php:46
+#: templates/admin.php:50
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
 msgstr "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS."
 
-#: templates/admin.php:60
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -358,68 +359,68 @@ msgid ""
 "root."
 msgstr "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem."
 
-#: templates/admin.php:71
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Upozornění nastavení"
 
-#: templates/admin.php:74
+#: templates/admin.php:78
 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 se zdá nefunkční."
 
-#: templates/admin.php:75
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Zkontrolujte prosím znovu <a href=\"%s\">instalační příručku</a>."
 
-#: templates/admin.php:86
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Schází modul 'fileinfo'"
 
-#: templates/admin.php:89
+#: templates/admin.php:93
 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í PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME."
 
-#: templates/admin.php:100
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Vaše verze PHP je zastaralá"
 
-#: templates/admin.php:103
+#: templates/admin.php:107
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr "Vámi používaná verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze obsahují chyby. Je možné, že tato instalace nebude fungovat správně."
 
-#: templates/admin.php:114
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalizace nefunguje"
 
-#: templates/admin.php:119
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Není možné nastavit znakovou sadu, která podporuje UTF-8."
 
-#: templates/admin.php:123
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů."
 
-#: templates/admin.php:127
+#: templates/admin.php:131
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s."
 
-#: templates/admin.php:139
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Připojení k internetu nefunguje"
 
-#: templates/admin.php:142
+#: templates/admin.php:146
 msgid ""
 "This server has no working internet connection. This means that some of the "
 "features like mounting of external storage, notifications about updates or "
@@ -428,162 +429,162 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru."
 
-#: templates/admin.php:156
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:163
+#: templates/admin.php:167
 msgid "Execute one task with each page loaded"
 msgstr "Spustit jednu úlohu s každým načtením stránky"
 
-#: templates/admin.php:171
+#: templates/admin.php:175
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http."
 
-#: templates/admin.php:179
+#: templates/admin.php:183
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Použít systémovou službu cron pro volání cron.php každých 15 minut."
 
-#: templates/admin.php:184
+#: templates/admin.php:188
 msgid "Sharing"
 msgstr "Sdílení"
 
-#: templates/admin.php:190
+#: templates/admin.php:194
 msgid "Enable Share API"
 msgstr "Povolit API sdílení"
 
-#: templates/admin.php:191
+#: templates/admin.php:195
 msgid "Allow apps to use the Share API"
 msgstr "Povolit aplikacím používat API sdílení"
 
-#: templates/admin.php:198
+#: templates/admin.php:202
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: templates/admin.php:199
+#: templates/admin.php:203
 msgid "Allow users to share items to the public with links"
 msgstr "Povolit uživatelům sdílet položky veřejně pomocí odkazů"
 
-#: templates/admin.php:207
+#: templates/admin.php:210
 msgid "Allow public uploads"
 msgstr "Povolit veřejné nahrávání souborů"
 
-#: templates/admin.php:208
+#: templates/admin.php:211
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Povolit uživatelům, aby mohli ostatním umožnit nahrávat do jejich veřejně sdílené složky"
 
-#: templates/admin.php:216
+#: templates/admin.php:218
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdílení"
 
-#: templates/admin.php:217
+#: templates/admin.php:219
 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:224
+#: templates/admin.php:226
 msgid "Allow users to share with anyone"
 msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
-#: templates/admin.php:227
+#: templates/admin.php:229
 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:234
+#: templates/admin.php:236
 msgid "Allow mail notification"
 msgstr "Povolit e-mailová upozornění"
 
-#: templates/admin.php:235
+#: templates/admin.php:237
 msgid "Allow user to send mail notification for shared files"
 msgstr "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory"
 
-#: templates/admin.php:242
+#: templates/admin.php:244
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: templates/admin.php:255
+#: templates/admin.php:257
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:257
+#: templates/admin.php:259
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Vynutí připojování klientů k %s šifrovaným spojením."
 
-#: templates/admin.php:263
+#: templates/admin.php:265
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL."
 
-#: templates/admin.php:275
+#: templates/admin.php:277
 msgid "Email Server"
-msgstr ""
+msgstr "Emailový server"
 
-#: templates/admin.php:277
+#: templates/admin.php:279
 msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "Toto se používá při odesílání upozornění."
 
-#: templates/admin.php:308
+#: templates/admin.php:310
 msgid "From address"
-msgstr ""
+msgstr "Adresa odesílatele"
 
-#: templates/admin.php:330
+#: templates/admin.php:332
 msgid "Authentication required"
-msgstr ""
+msgstr "Ověření vyžadováno"
 
-#: templates/admin.php:334
+#: templates/admin.php:336
 msgid "Server address"
 msgstr "Adresa serveru"
 
-#: templates/admin.php:338
+#: templates/admin.php:340
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:343
+#: templates/admin.php:345
 msgid "Credentials"
 msgstr "Přihlašovací údaje"
 
-#: templates/admin.php:344
+#: templates/admin.php:346
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP uživatelské jméno "
 
-#: templates/admin.php:347
+#: templates/admin.php:349
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP heslo"
 
-#: templates/admin.php:351
+#: templates/admin.php:353
 msgid "Test email settings"
-msgstr ""
+msgstr "Nastavení zkušebního emailu"
 
-#: templates/admin.php:352
+#: templates/admin.php:354
 msgid "Send email"
-msgstr ""
+msgstr "Odeslat e-mail"
 
-#: templates/admin.php:357
+#: templates/admin.php:359
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:358
+#: templates/admin.php:360
 msgid "Log level"
 msgstr "Úroveň zaznamenávání"
 
-#: templates/admin.php:390
+#: templates/admin.php:392
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:391
+#: templates/admin.php:393
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:397 templates/personal.php:181
+#: templates/admin.php:399 templates/personal.php:181
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:401 templates/personal.php:184
+#: templates/admin.php:403 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -607,7 +608,7 @@ msgstr "Vyberte aplikaci"
 
 #: templates/apps.php:42
 msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentace:"
 
 #: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
@@ -615,7 +616,7 @@ msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
 #: templates/apps.php:50
 msgid "See application website"
-msgstr ""
+msgstr "Prohlédněte si webovou stránku aplikace"
 
 #: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 0e8d3ba31551b5cfab5a8242859e1e1a5eccfb4b..5c62e786723cfbb12a55eee2d043c2d51afd3850 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
+"POT-Creation-Date: 2014-03-18 01:55-0400\n"
+"PO-Revision-Date: 2014-03-17 13:07+0000\n"
 "Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 5bcb442bd612c5c56aabbfeb7c4e2754c31f52ed..1874dfa459692f3243ab5b2310589a81505190fa 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
+"POT-Creation-Date: 2014-03-18 01:55-0400\n"
+"PO-Revision-Date: 2014-03-17 13:08+0000\n"
 "Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index 0bda08191dda6dc8dda533b7072cab81b86c9c06..03c81a6e1aa5fe89e2c03fca2d15d1b1d716ab9c 100644
--- a/l10n/en_GB/files_trashbin.po
+++ b/l10n/en_GB/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-15 05:40+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-03-18 01:55-0400\n"
+"PO-Revision-Date: 2014-03-17 13:08+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 6043c86f2791b8f8452e5d4728be16a8af5c529a..9eb29ced3e940d18985826e7bbf7ecd0f1d56d8d 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
+"POT-Creation-Date: 2014-03-18 01:55-0400\n"
+"PO-Revision-Date: 2014-03-17 13:08+0000\n"
 "Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -193,8 +193,8 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL username and/or password not valid: %s"
 
 #: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:114 private/setup/postgresql.php:24
-#: private/setup/postgresql.php:70
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr "You need to enter either an existing account or the administrator."
 
@@ -207,9 +207,9 @@ msgstr "MySQL/MariaDB username and/or password not valid"
 #: private/setup/oci.php:151 private/setup/oci.php:162
 #: private/setup/oci.php:169 private/setup/oci.php:178
 #: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 private/setup/postgresql.php:89
-#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
-#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Error: \"%s\""
@@ -218,9 +218,9 @@ msgstr "DB Error: \"%s\""
 #: private/setup/oci.php:122 private/setup/oci.php:145
 #: private/setup/oci.php:152 private/setup/oci.php:163
 #: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 private/setup/postgresql.php:90
-#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
-#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Offending command was: \"%s\""
@@ -256,7 +256,7 @@ msgstr "Oracle username and/or password not valid"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Offending command was: \"%s\", name: %s, password: %s"
 
-#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL username and/or password not valid"
 
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index af4a22f997c98e750b2b5d0f26da3e61139283b1..fcc17d943e385c61384806265441aa5264461279 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 16:51+0000\n"
+"POT-Creation-Date: 2014-03-18 01:55-0400\n"
+"PO-Revision-Date: 2014-03-17 13:07+0000\n"
 "Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -212,31 +212,31 @@ msgstr "Update"
 msgid "Updated"
 msgstr "Updated"
 
-#: js/personal.js:244
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Select a profile picture"
 
-#: js/personal.js:274
+#: js/personal.js:277
 msgid "Very weak password"
 msgstr "Very weak password"
 
-#: js/personal.js:275
+#: js/personal.js:278
 msgid "Weak password"
 msgstr "Weak password"
 
-#: js/personal.js:276
+#: js/personal.js:279
 msgid "So-so password"
 msgstr "So-so password"
 
-#: js/personal.js:277
+#: js/personal.js:280
 msgid "Good password"
 msgstr "Good password"
 
-#: js/personal.js:278
+#: js/personal.js:281
 msgid "Strong password"
 msgstr "Strong password"
 
-#: js/personal.js:301
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decrypting files... Please wait, this can take some time."
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 739fe82bc5a2b2ce396746bc24029d13b529adbc..4ed00c9fc1ce4a0f31199ee6e897066bbcbbea21 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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.pot b/l10n/templates/files.pot
index 9ef5bd9a7ea74346c138d607e14afdcbb6d00df3..9aa0ab9820bad5e57d946e57b1b9976426464190 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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_encryption.pot b/l10n/templates/files_encryption.pot
index df982cb2aa8175fa946b2d9d93bd81ff510571db..d93fbf74b5e06650710478eb9fd49a12b6eae436 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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 4ebf608a695bbae5316565c939609b2c900f7a97..13b11589d3748139235a65cda04af46aa2fcec1a 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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_sharing.pot b/l10n/templates/files_sharing.pot
index a7f508d6c7f76a34784c925cf7820963967d5ea4..20282edb4f37a08f923514455ae2406802887c75 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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_trashbin.pot b/l10n/templates/files_trashbin.pot
index 476271c8a183c15d52527ed7d0104cbafccbf1df..072aabb5c7f216170de39336a9e7ebc2df05e43b 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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_versions.pot b/l10n/templates/files_versions.pot
index c3819fbb14244c4cf423eb2676009ef395ff07fb..979e5d1aaa39973b4e4e2320782b9a37e945dad2 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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/lib.pot b/l10n/templates/lib.pot
index 0b283aecb0ad67abe73dff705b9357cb4234c847..d12067e9690ca7a84421fb21a273f6cbfc537422 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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/private.pot b/l10n/templates/private.pot
index cf9c58e8727f164119213ccefaddaba09652f37b..caf31020691f6e809db33f3fced59f38a1b9002b 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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/settings.pot b/l10n/templates/settings.pot
index cd9eb5ddc80ca2638d7f4bac674eef9bffe17b99..8e957cdf9b12e4598b8d83173bd8a5adce83b960 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:284
+#: admin/controller.php:116 templates/admin.php:282
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:297 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:295 templates/personal.php:159
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:321
+#: admin/controller.php:120 templates/admin.php:319
 msgid "Authentication method"
 msgstr ""
 
@@ -459,123 +459,123 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:210
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:211
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:220
+#: templates/admin.php:218
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:219
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:228
+#: templates/admin.php:226
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:231
+#: templates/admin.php:229
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:238
+#: templates/admin.php:236
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:239
+#: templates/admin.php:237
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:246
+#: templates/admin.php:244
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:259
+#: templates/admin.php:257
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:261
+#: templates/admin.php:259
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:267
+#: templates/admin.php:265
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:277
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:281
+#: templates/admin.php:279
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:310
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:334
+#: templates/admin.php:332
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:338
+#: templates/admin.php:336
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:342
+#: templates/admin.php:340
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:347
+#: templates/admin.php:345
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:348
+#: templates/admin.php:346
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:351
+#: templates/admin.php:349
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:355
+#: templates/admin.php:353
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:356
+#: templates/admin.php:354
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:361
+#: templates/admin.php:359
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:362
+#: templates/admin.php:360
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:392
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:393
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:401 templates/personal.php:181
+#: templates/admin.php:399 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:405 templates/personal.php:184
+#: templates/admin.php:403 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index ecc5296dc0829aaaadf399ba5e8561e1e2211b23..9edf577b824252ebed6909fb847de3624b33a89a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 215b72860b8d454826c610cdaec8aa0a1e3f9880..0575f3413a505177390c35064be065882abd170e 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-17 01:55-0400\n"
+"POT-Creation-Date: 2014-03-19 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/lib/l10n/ca.php b/lib/l10n/ca.php
index f1d3eb96294c66b202db39b65392887c92f3590e..88bb8ec9eee8ef289504e25f2d6d749829ede094 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "L'aplicació no està habilitada",
 "Authentication error" => "Error d'autenticació",
 "Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.",
+"Unknown user" => "Usuari desconegut",
 "Files" => "Fitxers",
 "Text" => "Text",
 "Images" => "Imatges",
@@ -39,8 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s no podeu usar punts en el nom de la base de dades",
 "MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
 "You need to enter either an existing account or the administrator." => "Heu d'escriure un compte existent o el d'administrador.",
+"MySQL/MariaDB username and/or password not valid" => "El nom d'usuari i/o la contrasenya de MySQL/MariaDB no són vàlids",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
 "Offending command was: \"%s\"" => "L'ordre en conflicte és: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "L'usuari MySQL/MariaDB '%s'@'localhost' ja existeix.",
+"Drop this user from MySQL/MariaDB" => "Esborreu aquest usuari de MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "L'usuari MySQL/MariaDB '%s'@'%%' ja existeix",
+"Drop this user from MySQL/MariaDB." => "Esborreu aquest usuari de MySQL/MariaDB.",
 "Oracle connection could not be established" => "No s'ha pogut establir la connexió Oracle",
 "Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no vàlids",
 "Offending command was: \"%s\", name: %s, password: %s" => "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index d74a96a5a99402d6b95b20000c369887aeade4b2..7969060b2cd67b9d8ee9f85b3236504a8246db94 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Aplikace není povolena",
 "Authentication error" => "Chyba ověření",
 "Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
+"Unknown user" => "Neznámý uživatel",
 "Files" => "Soubory",
 "Text" => "Text",
 "Images" => "Obrázky",
@@ -39,8 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "V názvu databáze %s nesmíte používat tečky.",
 "MS SQL username and/or password not valid: %s" => "Uživatelské jméno či heslo MSSQL není platné: %s",
 "You need to enter either an existing account or the administrator." => "Musíte zadat existující účet či správce.",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB uživatelské jméno a/nebo heslo je neplatné",
 "DB Error: \"%s\"" => "Chyba databáze: \"%s\"",
 "Offending command was: \"%s\"" => "Příslušný příkaz byl: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB uživatel '%s'@'localhost' již existuje.",
+"Drop this user from MySQL/MariaDB" => "Zahodit uživatele z MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB uživatel '%s'@'%%' již existuje",
+"Drop this user from MySQL/MariaDB." => "Zahodit uživatele z MySQL/MariaDB.",
 "Oracle connection could not be established" => "Spojení s Oracle nemohlo být navázáno",
 "Oracle username and/or password not valid" => "Uživatelské jméno či heslo Oracle není platné",
 "Offending command was: \"%s\", name: %s, password: %s" => "Příslušný příkaz byl: \"%s\", jméno: %s, heslo: %s",
diff --git a/lib/private/files/cache/legacy.php b/lib/private/files/cache/legacy.php
deleted file mode 100644
index 4d5f58741e969f75a410c73bfb72404c1c55c610..0000000000000000000000000000000000000000
--- a/lib/private/files/cache/legacy.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Files\Cache;
-
-/**
- * Provide read only support for the old filecache
- */
-class Legacy {
-	private $user;
-
-	private $cacheHasItems = null;
-
-	/**
-	 * @param string $user
-	 */
-	public function __construct($user) {
-		$this->user = $user;
-	}
-
-	/**
-	 * get the numbers of items in the legacy cache
-	 *
-	 * @return int
-	 */
-	function getCount() {
-		$sql = 'SELECT COUNT(`id`) AS `count` FROM `*PREFIX*fscache` WHERE `user` = ?';
-		$result = \OC_DB::executeAudited($sql, array($this->user));
-		if ($row = $result->fetchRow()) {
-			return $row['count'];
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * check if a legacy cache is present and holds items
-	 *
-	 * @return bool
-	 */
-	function hasItems() {
-		if (!is_null($this->cacheHasItems)) {
-			return $this->cacheHasItems;
-		}
-		try {
-			$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `user` = ?',1);
-		} catch (\Exception $e) {
-			$this->cacheHasItems = false;
-			return false;
-		}
-		try {
-			$result = $query->execute(array($this->user));
-		} catch (\Exception $e) {
-			$this->cacheHasItems = false;
-			return false;
-		}
-
-		if ($result === false || property_exists($result, 'error_message_prefix')) {
-			$this->cacheHasItems = false;
-			return false;
-		}
-
-		$this->cacheHasItems = (bool)$result->fetchRow();
-		return $this->cacheHasItems;
-	}
-
-	/**
-	 * get an item from the legacy cache
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	function get($path) {
-		if (is_numeric($path)) {
-			$sql = 'SELECT * FROM `*PREFIX*fscache` WHERE `id` = ?';
-		} else {
-			$sql = 'SELECT * FROM `*PREFIX*fscache` WHERE `path` = ?';
-		}
-		$result = \OC_DB::executeAudited($sql, array($path));
-		$data = $result->fetchRow();
-		$data['etag'] = $this->getEtag($data['path'], $data['user']);
-		return $data;
-	}
-
-	/**
-	 * Get the ETag for the given path
-	 *
-	 * @param type $path
-	 * @return string
-	 */
-	function getEtag($path, $user = null) {
-		static $query = null;
-
-		$pathDetails = explode('/', $path, 4);
-		if((!$user) && !isset($pathDetails[1])) {
-			//no user!? Too odd, return empty string.
-			return '';
-		} else if(!$user) {
-			//guess user from path, if no user passed.
-			$user = $pathDetails[1];
-		}
-
-		if(!isset($pathDetails[3]) || is_null($pathDetails[3])) {
-			$relativePath = '';
-		} else {
-			$relativePath = $pathDetails[3];
-		}
-
-		if(is_null($query)){
-			$query = \OC_DB::prepare('SELECT `propertyvalue` FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = \'{DAV:}getetag\'');
-		}
-		$result = \OC_DB::executeAudited($query,array($user, '/' . $relativePath));
-		if ($row = $result->fetchRow()) {
-			return trim($row['propertyvalue'], '"');
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * get all child items of an item from the legacy cache
-	 *
-	 * @param int $id
-	 * @return array
-	 */
-	function getChildren($id) {
-		$result = \OC_DB::executeAudited('SELECT * FROM `*PREFIX*fscache` WHERE `parent` = ?', array($id));
-		$data = $result->fetchAll();
-		foreach ($data as $i => $item) {
-			$data[$i]['etag'] = $this->getEtag($item['path'], $item['user']);
-		}
-		return $data;
-	}
-}
diff --git a/lib/private/files/cache/upgrade.php b/lib/private/files/cache/upgrade.php
deleted file mode 100644
index e3a46896cbfa49a18f26d0d2446346a170a61a9f..0000000000000000000000000000000000000000
--- a/lib/private/files/cache/upgrade.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Files\Cache;
-
-class Upgrade {
-	/**
-	 * @var Legacy $legacy
-	 */
-	private $legacy;
-
-	private $numericIds = array();
-
-	private $mimeTypeIds = array();
-
-	/**
-	 * @param Legacy $legacy
-	 */
-	public function __construct($legacy) {
-		$this->legacy = $legacy;
-	}
-
-	/**
-	 * Preform a upgrade a path and it's childs
-	 *
-	 * @param string $path
-	 * @param bool $mode
-	 */
-	function upgradePath($path, $mode = Scanner::SCAN_RECURSIVE) {
-		if (!$this->legacy->hasItems()) {
-			return;
-		}
-		\OC_Hook::emit('\OC\Files\Cache\Upgrade', 'migrate_path', $path);
-		if ($row = $this->legacy->get($path)) {
-			$data = $this->getNewData($row);
-			if ($data) {
-				$this->insert($data);
-				$this->upgradeChilds($data['id'], $mode);
-			}
-		}
-	}
-
-	/**
-	 * upgrade all child elements of an item
-	 *
-	 * @param int $id
-	 * @param bool $mode
-	 */
-	function upgradeChilds($id, $mode = Scanner::SCAN_RECURSIVE) {
-		$children = $this->legacy->getChildren($id);
-		foreach ($children as $child) {
-			$childData = $this->getNewData($child);
-			\OC_Hook::emit('\OC\Files\Cache\Upgrade', 'migrate_path', $child['path']);
-			if ($childData) {
-				$this->insert($childData);
-				if ($mode == Scanner::SCAN_RECURSIVE) {
-					$this->upgradeChilds($child['id']);
-				}
-			}
-		}
-	}
-
-	/**
-	 * insert data into the new cache
-	 *
-	 * @param array $data the data for the new cache
-	 */
-	function insert($data) {
-		static $insertQuery = null;
-		if(is_null($insertQuery)) {
-			$insertQuery = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`
-				( `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag` )
-				VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
-		}
-		if (!$this->inCache($data['storage'], $data['path_hash'], $data['id'])) {
-			\OC_DB::executeAudited($insertQuery, array($data['id'], $data['storage'],
-				$data['path'], $data['path_hash'], $data['parent'], $data['name'],
-				$data['mimetype'], $data['mimepart'], $data['size'], $data['mtime'], $data['encrypted'], $data['etag']));
-		}
-	}
-
-	/**
-	 * check if an item is already in the new cache
-	 *
-	 * @param string $storage
-	 * @param string $pathHash
-	 * @param string $id
-	 * @return bool
-	 */
-	function inCache($storage, $pathHash, $id) {
-		static $query = null;
-		if(is_null($query)) {
-			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE (`storage` = ? AND `path_hash` = ?) OR `fileid` = ?');
-		}
-		$result = \OC_DB::executeAudited($query, array($storage, $pathHash, $id));
-		return (bool)$result->fetchRow();
-	}
-
-	/**
-	 * get the new data array from the old one
-	 *
-	 * @param array $data the data from the old cache
-	 * Example data array
-	 * Array
-	 *	(
-	 *		[id] => 418
-	 *		[path] => /tina/files/picture.jpg		//relative to datadir
-	 *		[path_hash] => 66d4547e372888deed80b24fec9b192b
-	 *		[parent] => 234
-	 *		[name] => picture.jpg
-	 *		[user] => tina
-	 *		[size] => 1265283
-	 *		[ctime] => 1363909709
-	 *		[mtime] => 1363909709
-	 *		[mimetype] => image/jpeg
-	 *		[mimepart] => image
-	 *		[encrypted] => 0
-	 *		[versioned] => 0
-	 *		[writable] => 1
-	 *	)
-	 *
-	 * @return array
-	 */
-	function getNewData($data) {
-		//Make sure there is a path, otherwise we can do nothing.
-		if(!isset($data['path'])) {
-			return false;
-		}
-		$newData = $data;
-		/**
-		 * @var \OC\Files\Storage\Storage $storage
-		 * @var string $internalPath;
-		 */
-		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($data['path']);
-		if ($storage) {
-			$newData['etag'] = $data['etag'];
-			$newData['path_hash'] = md5($internalPath);
-			$newData['path'] = $internalPath;
-			$newData['storage'] = $this->getNumericId($storage);
-			$newData['parent'] = ($internalPath === '') ? -1 : $data['parent'];
-			$newData['permissions'] = ($data['writable']) ? \OCP\PERMISSION_ALL : \OCP\PERMISSION_READ;
-			$newData['storage_object'] = $storage;
-			$newData['mimetype'] = $this->getMimetypeId($newData['mimetype'], $storage);
-			$newData['mimepart'] = $this->getMimetypeId($newData['mimepart'], $storage);
-			return $newData;
-		} else {
-			\OC_Log::write('core', 'Unable to migrate data from old cache for '.$data['path'].' because the storage was not found', \OC_Log::ERROR);
-			return false;
-		}
-	}
-
-	/**
-	 * get the numeric storage id
-	 *
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @return int
-	 */
-	function getNumericId($storage) {
-		$storageId = $storage->getId();
-		if (!isset($this->numericIds[$storageId])) {
-			$cache = $storage->getCache();
-			$this->numericIds[$storageId] = $cache->getNumericStorageId();
-		}
-		return $this->numericIds[$storageId];
-	}
-
-	/**
-	 * get the numeric id for a mimetype
-	 *
-	 * @param string $mimetype
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @return int
-	 */
-	function getMimetypeId($mimetype, $storage) {
-		if (!isset($this->mimeTypeIds[$mimetype])) {
-			$cache = new Cache($storage);
-			$this->mimeTypeIds[$mimetype] = $cache->getMimetypeId($mimetype);
-		}
-		return $this->mimeTypeIds[$mimetype];
-	}
-
-	/**
-	 * check if a cache upgrade is required for $user
-	 *
-	 * @param string $user
-	 * @return bool
-	 */
-	static function needUpgrade($user) {
-		$cacheVersion = (int)\OCP\Config::getUserValue($user, 'files', 'cache_version', 4);
-		if ($cacheVersion < 5) {
-			$legacy = new \OC\Files\Cache\Legacy($user);
-			if ($legacy->hasItems()) {
-				return true;
-			}
-			self::upgradeDone($user);
-		}
-
-		return false;
-	}
-
-	/**
-	 * mark the filecache as upgrade
-	 *
-	 * @param string $user
-	 */
-	static function upgradeDone($user) {
-		\OCP\Config::setUserValue($user, 'files', 'cache_version', 5);
-	}
-
-	/**
-	 * Does a "silent" upgrade, i.e. without an Event-Source as triggered
-	 * on User-Login via Ajax. This method is called within the regular
-	 * ownCloud upgrade.
-	 *
-	 * @param string $user a User ID
-	 */
-	public static function doSilentUpgrade($user) {
-		if(!self::needUpgrade($user)) {
-			return;
-		}
-		$legacy = new \OC\Files\Cache\Legacy($user);
-		if ($legacy->hasItems()) {
-			\OC_DB::beginTransaction();
-			$upgrade = new \OC\Files\Cache\Upgrade($legacy);
-			$upgrade->upgradePath('/' . $user . '/files');
-			\OC_DB::commit();
-		}
-		\OC\Files\Cache\Upgrade::upgradeDone($user);
-	}
-}
diff --git a/lib/private/updater.php b/lib/private/updater.php
index dd8dc84e80423ab302879d67eb81506f3a929cf8..1354f3fd2f8edbb81cb7612a37b026aa95c064f8 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -16,9 +16,6 @@ use OC\Hooks\BasicEmitter;
  *  - maintenanceStart()
  *  - maintenanceEnd()
  *  - dbUpgrade()
- *  - filecacheStart()
- *  - filecacheProgress(int $percentage)
- *  - filecacheDone()
  *  - failure(string $message)
  */
 class Updater extends BasicEmitter {
@@ -122,9 +119,6 @@ class Updater extends BasicEmitter {
 			\OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
 			$this->emit('\OC\Updater', 'dbUpgrade');
 
-			// do a file cache upgrade for users with files
-			// this can take loooooooooooooooooooooooong
-			$this->upgradeFileCache();
 		} catch (\Exception $exception) {
 			$this->emit('\OC\Updater', 'failure', array($exception->getMessage()));
 		}
@@ -142,42 +136,5 @@ class Updater extends BasicEmitter {
 		$this->emit('\OC\Updater', 'maintenanceEnd');
 	}
 
-	private function upgradeFileCache() {
-		try {
-			$query = \OC_DB::prepare('
-				SELECT DISTINCT `user`
-				FROM `*PREFIX*fscache`
-			');
-			$result = $query->execute();
-		} catch (\Exception $e) {
-			return;
-		}
-		$users = $result->fetchAll();
-		if (count($users) == 0) {
-			return;
-		}
-		$step = 100 / count($users);
-		$percentCompleted = 0;
-		$lastPercentCompletedOutput = 0;
-		$startInfoShown = false;
-		foreach ($users as $userRow) {
-			$user = $userRow['user'];
-			\OC\Files\Filesystem::initMountPoints($user);
-			\OC\Files\Cache\Upgrade::doSilentUpgrade($user);
-			if (!$startInfoShown) {
-				//We show it only now, because otherwise Info about upgraded apps
-				//will appear between this and progress info
-				$this->emit('\OC\Updater', 'filecacheStart');
-				$startInfoShown = true;
-			}
-			$percentCompleted += $step;
-			$out = floor($percentCompleted);
-			if ($out != $lastPercentCompletedOutput) {
-				$this->emit('\OC\Updater', 'filecacheProgress', array($out));
-				$lastPercentCompletedOutput = $out;
-			}
-		}
-		$this->emit('\OC\Updater', 'filecacheDone');
-	}
 }
 
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index be32fd94d5ba201afcd461679b8eee9ff203da06..92c5450b7dca8bbdcc552d45d5d7e7c553ead06a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,7 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "El valor proporcionat no és vàlid per %s",
+"Saved" => "Desat",
+"test email settings" => "prova l'arranjament del correu",
+"If you received this email, the settings seem to be correct." => "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Hi ha hagut un problema en enviar el correu. Comproveu-ne l'arranjament.",
 "Email sent" => "El correu electrónic s'ha enviat",
+"You need to set your user email before being able to send test emails." => "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
+"Send mode" => "Mode d'enviament",
 "Encryption" => "Xifrat",
+"Authentication method" => "Mètode d'autenticació",
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
 "Authentication error" => "Error d'autenticació",
 "Your full name has been changed." => "El vostre nom complet ha canviat.",
@@ -24,7 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
 "Unable to change password" => "No es pot canviar la contrasenya",
+"Sending..." => "Enviant...",
 "User Documentation" => "Documentació d'usuari",
+"Admin Documentation" => "Documentació d'administrador",
 "Update to {appversion}" => "Actualitza a {appversion}",
 "Disable" => "Desactiva",
 "Enable" => "Habilita",
@@ -62,6 +72,10 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Només problemes fatals",
 "None" => "Cap",
 "Login" => "Inici de sessió",
+"Plain" => "Pla",
+"NT LAN Manager" => "Gestor NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Avís de seguretat",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
 "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.",
@@ -99,9 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Força HTTPS",
 "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.",
+"Email Server" => "Servidor de correu",
+"This is used for sending out notifications." => "S'usa per enviar notificacions.",
+"From address" => "Des de l'adreça",
+"Authentication required" => "Es requereix autenticació",
 "Server address" => "Adreça del servidor",
 "Port" => "Port",
 "Credentials" => "Credencials",
+"SMTP Username" => "Nom d'usuari SMTP",
+"SMTP Password" => "Contrasenya SMTP",
+"Test email settings" => "Prova l'arranjament del correu",
+"Send email" => "Envia correu",
 "Log" => "Registre",
 "Log level" => "Nivell de registre",
 "More" => "Més",
@@ -111,7 +133,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Afegiu la vostra aplicació",
 "More Apps" => "Més aplicacions",
 "Select an App" => "Seleccioneu una aplicació",
+"Documentation:" => "Documentació:",
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
+"See application website" => "Mostra la web de l'aplicació",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
 "Administrator Documentation" => "Documentació d'administrador",
 "Online Documentation" => "Documentació en línia",
@@ -130,6 +154,7 @@ $TRANSLATIONS = array(
 "Full Name" => "Nom complet",
 "Email" => "Correu electrònic",
 "Your email address" => "Correu electrònic",
+"Fill in an email address to enable password recovery and receive notifications" => "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions",
 "Profile picture" => "Foto de perfil",
 "Upload new" => "Puja'n una de nova",
 "Select new from Files" => "Selecciona'n una de nova dels fitxers",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 396b49b4f7e23d34b717772722787245a32bf812..778a05bd5e4b8f097972f0863ce6514dc96dd99e 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,7 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Uloženo",
 "Email sent" => "E-mail odeslán",
 "Encryption" => "Šifrování",
+"Authentication method" => "Metoda autentifikace",
 "Unable to load list from App Store" => "Nelze načíst seznam z App Store",
 "Authentication error" => "Chyba přihlášení",
 "Your full name has been changed." => "Vaše celé jméno bylo změněno.",
@@ -24,7 +26,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
 "Unable to change password" => "Změna hesla se nezdařila",
+"Sending..." => "Odesílání...",
 "User Documentation" => "Uživatelská dokumentace",
+"Admin Documentation" => "Dokumentace pro administrátory",
 "Update to {appversion}" => "Aktualizovat na {appversion}",
 "Disable" => "Zakázat",
 "Enable" => "Povolit",
@@ -37,6 +41,11 @@ $TRANSLATIONS = array(
 "Update" => "Aktualizovat",
 "Updated" => "Aktualizováno",
 "Select a profile picture" => "Vyberte profilový obrázek",
+"Very weak password" => "Velmi slabé heslo",
+"Weak password" => "Slabé heslo",
+"So-so password" => "Středně silné heslo",
+"Good password" => "Dobré heslo",
+"Strong password" => "Silné heslo",
 "Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
@@ -57,6 +66,8 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Pouze fatální problémy",
 "None" => "Žádné",
 "Login" => "Přihlásit",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Bezpečnostní upozornění",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
@@ -94,9 +105,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Vynutit HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL.",
+"Email Server" => "Emailový server",
+"This is used for sending out notifications." => "Toto se používá při odesílání upozornění.",
+"From address" => "Adresa odesílatele",
+"Authentication required" => "Ověření vyžadováno",
 "Server address" => "Adresa serveru",
 "Port" => "Port",
 "Credentials" => "Přihlašovací údaje",
+"SMTP Username" => "SMTP uživatelské jméno ",
+"SMTP Password" => "SMTP heslo",
+"Test email settings" => "Nastavení zkušebního emailu",
+"Send email" => "Odeslat e-mail",
 "Log" => "Záznam",
 "Log level" => "Úroveň zaznamenávání",
 "More" => "Více",
@@ -106,7 +125,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Přidat Vaši aplikaci",
 "More Apps" => "Více aplikací",
 "Select an App" => "Vyberte aplikaci",
+"Documentation:" => "Dokumentace:",
 "See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
+"See application website" => "Prohlédněte si webovou stránku aplikace",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
 "Administrator Documentation" => "Dokumentace správce",
 "Online Documentation" => "Online dokumentace",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5ed42eab0ff80471e99e42bea2107e43f3a230c7..6e816c1fff6472b818fbc82b23d71095e5ea9374 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -203,7 +203,6 @@ if (!$_['internetconnectionworking']) {
 				<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('class="hidden"');?>>
 				<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
@@ -212,7 +211,6 @@ if (!$_['internetconnectionworking']) {
 				<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('class="hidden"');?>>
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"